Skip to content

Commit f4ca4cd

Browse files
committed
WS Cleanup Stage #5 - break long define
For long define statements put the replacement part on their own line. Also wrap comments on long lines.
1 parent f2c51e4 commit f4ca4cd

31 files changed

+435
-213
lines changed

XSUB.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">.
386386
HS_CXT, __FILE__, "v" PERL_API_VERSION_STRING, XS_VERSION)
387387
#else
388388
/* should this be a #error? if you want both checked, you better supply XS_VERSION right? */
389-
# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK
389+
# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK \
390+
XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK
390391
#endif
391392

392393
/* For a normal bootstrap without API or XS version checking.

cop.h

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,11 @@ typedef struct rcpv RCPV;
555555
#define RCPVf_NO_COPY (1 << 1)
556556
#define RCPVf_ALLOW_EMPTY (1 << 2)
557557

558-
#define RCPVx(pv_arg) ((RCPV *)((pv_arg) - STRUCT_OFFSET(struct rcpv, pv)))
558+
#define RCPVx(pv_arg) \
559+
((RCPV *)((pv_arg) - STRUCT_OFFSET(struct rcpv, pv)))
559560
#define RCPV_REFCOUNT(pv) (RCPVx(pv)->refcount)
560-
#define RCPV_LEN(pv) (RCPVx(pv)->len-1) /* len always includes space for a null */
561+
#define RCPV_LEN(pv) (RCPVx(pv)->len-1) /* len always includes space
562+
for a null */
561563

562564
#ifdef USE_ITHREADS
563565

@@ -567,10 +569,12 @@ typedef struct rcpv RCPV;
567569
(CopFILE(c) \
568570
? gv_fetchfile(CopFILE(c)) : NULL)
569571

570-
# define CopFILE_set_x(c,pv) ((c)->cop_file = rcpv_new((pv),0,RCPVf_USE_STRLEN))
572+
# define CopFILE_set_x(c,pv) \
573+
((c)->cop_file = rcpv_new((pv),0,RCPVf_USE_STRLEN))
571574
# define CopFILE_setn_x(c,pv,l) ((c)->cop_file = rcpv_new((pv),(l),0))
572575
# define CopFILE_free_x(c) ((c)->cop_file = rcpv_free((c)->cop_file))
573-
# define CopFILE_copy_x(dst,src) ((dst)->cop_file = rcpv_copy((src)->cop_file))
576+
# define CopFILE_copy_x(dst,src) \
577+
((dst)->cop_file = rcpv_copy((src)->cop_file))
574578

575579
/* change condition to 1 && to enable this debugging */
576580
# define CopFILE_debug(c,t,rk) \
@@ -631,7 +635,8 @@ typedef struct rcpv RCPV;
631635
# define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
632636
# define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv))
633637
# define CopFILE_copy(dst,src) CopFILEGV_set((dst),CopFILEGV(src))
634-
# define CopFILE_setn(c,pv,l) CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0))
638+
# define CopFILE_setn(c,pv,l) \
639+
CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0))
635640
# define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : NULL)
636641
# define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : NULL)
637642
# ifdef DEBUGGING
@@ -648,7 +653,8 @@ typedef struct rcpv RCPV;
648653
? GvNAMELEN(CopFILEGV(c))-2 : 0)
649654
# define CopSTASH(c) ((c)->cop_stash)
650655
# define CopSTASH_set(c,hv) ((c)->cop_stash = (hv))
651-
# define CopFILE_free(c) (SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL))
656+
# define CopFILE_free(c) \
657+
(SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL))
652658

653659
#endif /* USE_ITHREADS */
654660

@@ -660,7 +666,8 @@ typedef struct rcpv RCPV;
660666
#define CopHINTHASH_get(c) ((COPHH*)((c)->cop_hints_hash))
661667
#define CopHINTHASH_set(c,h) ((c)->cop_hints_hash = (h))
662668

663-
#define CopFEATURES_setfrom(dst, src) ((dst)->cop_features = (src)->cop_features)
669+
#define CopFEATURES_setfrom(dst, src) \
670+
((dst)->cop_features = (src)->cop_features)
664671

665672
/*
666673
=for apidoc Am|SV *|cop_hints_fetch_pv |const COP *cop|const char *key |U32 hash|U32 flags
@@ -781,7 +788,8 @@ by setting C<*flags> to 0 or C<SVf_UTF8>.
781788

782789
#define CopLABEL(c) Perl_cop_fetch_label(aTHX_ (c), NULL, NULL)
783790
#define CopLABEL_len(c,len) Perl_cop_fetch_label(aTHX_ (c), len, NULL)
784-
#define CopLABEL_len_flags(c,len,flags) Perl_cop_fetch_label(aTHX_ (c), len, flags)
791+
#define CopLABEL_len_flags(c,len,flags) \
792+
Perl_cop_fetch_label(aTHX_ (c), len, flags)
785793
#define CopLABEL_alloc(pv) ((pv)?savepv(pv):NULL)
786794

787795
#define CopSTASH_ne(c,hv) (!CopSTASH_eq(c,hv))
@@ -939,7 +947,8 @@ struct block_loop {
939947

940948
#define CxLABEL(c) (CopLABEL((c)->blk_oldcop))
941949
#define CxLABEL_len(c,len) (CopLABEL_len((c)->blk_oldcop, len))
942-
#define CxLABEL_len_flags(c,len,flags) ((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags))
950+
#define CxLABEL_len_flags(c,len,flags) \
951+
((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags))
943952
#define CxHASARGS(c) (((c)->cx_type & CXp_HASARGS) == CXp_HASARGS)
944953

945954
/* CxLVAL(): the lval flags of the call site: the relevant flag bits from

cv.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ See L<perlguts/Autoloading with XSUBs>.
3838
# define Nullcv Null(CV*)
3939
#endif
4040

41-
#define CvSTASH(sv) (MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash))
41+
#define CvSTASH(sv) \
42+
(MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash))
4243
#define CvSTASH_set(cv,st) Perl_cvstash_set(aTHX_ cv, st)
4344
#define CvSTART(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_start
4445
#define CvROOT(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_root
4546
#define CvXSUB(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_xsub
46-
#define CvXSUBANY(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany
47+
#define CvXSUBANY(sv) \
48+
((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany
4749
#define CvGV(sv) Perl_CvGV(aTHX_ (CV *)(sv))
4850
#define CvGV_set(cv,gv) Perl_cvgv_set(aTHX_ cv, gv)
4951
#define CvHASGV(cv) cBOOL(SvANY(cv)->xcv_gv_u.xcv_gv)

dosish.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
#else
2222
# define PERL_SYS_INIT_BODY(c,v) \
2323
MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT
24-
# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
24+
# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined,
25+
or somethin?" */
2526
#endif
2627

2728
/* Generally add things last-in first-terminated. IO and memory terminations

gv.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ struct gp {
5454
assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >= SVt_PVLV); \
5555
&(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek); \
5656
}))
57-
# define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); })
58-
# define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
59-
# define GvNAMEUTF8(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); })
57+
# define GvNAME_get(gv) \
58+
({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); })
59+
# define GvNAMELEN_get(gv) \
60+
({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
61+
# define GvNAMEUTF8(gv) \
62+
({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); })
6063
#else
6164
# define GvGP(gv) (0+(gv)->sv_u.svu_gp)
6265
# define GvGP_set(gv,gp) ((gv)->sv_u.svu_gp = (gp))
@@ -228,9 +231,11 @@ Return the CV from the GV.
228231
time, so don't try to free what's there. */
229232
#define GV_ADDMULTI 0x02 /* add, pretending it has been added
230233
already; used also by gv_init_* */
231-
#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't already there */
234+
#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't
235+
already there */
232236
/* 0x08 UNUSED */
233-
#define GV_NOINIT 0x10 /* add, but don't init symbol, if type != PVGV */
237+
#define GV_NOINIT 0x10 /* add, but don't init symbol,
238+
if type != PVGV */
234239
/* This is used by toke.c to avoid turing placeholder constants in the symbol
235240
table into full PVGVs with attached constant subroutines. */
236241
#define GV_NOADD_NOINIT 0x20 /* Don't add the symbol if it's not there.
@@ -273,9 +278,12 @@ Return the CV from the GV.
273278
#define gv_fetchsv_nomg(n,f,t) gv_fetchsv(n,(f)|GV_NO_SVGMAGIC,t)
274279
#define gv_init(gv,stash,name,len,multi) \
275280
gv_init_pvn(gv,stash,name,len,GV_ADDMULTI*cBOOL(multi))
276-
#define gv_fetchmeth(stash,name,len,level) gv_fetchmeth_pvn(stash, name, len, level, 0)
277-
#define gv_fetchmeth_autoload(stash,name,len,level) gv_fetchmeth_pvn_autoload(stash, name, len, level, 0)
278-
#define gv_fetchmethod_flags(stash,name,flags) gv_fetchmethod_pv_flags(stash, name, flags)
281+
#define gv_fetchmeth(stash,name,len,level) \
282+
gv_fetchmeth_pvn(stash, name, len, level, 0)
283+
#define gv_fetchmeth_autoload(stash,name,len,level) \
284+
gv_fetchmeth_pvn_autoload(stash, name, len, level, 0)
285+
#define gv_fetchmethod_flags(stash,name,flags) \
286+
gv_fetchmethod_pv_flags(stash, name, flags)
279287

280288
/*
281289
=for apidoc gv_autoload4

handy.h

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ required, but is kept for backwards compatibility.
158158
* XXX Should really be a Configure probe, with HAS__FUNCTION__
159159
* and FUNCTION__ as results.
160160
* XXX Similarly, a Configure probe for __FILE__ and __LINE__ is needed. */
161-
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__SUNPRO_C)) /* C99 or close enough. */
161+
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||\
162+
(defined(__SUNPRO_C)) /* C99 or close enough. */
162163
# define FUNCTION__ __func__
163164
# define SAFE_FUNCTION__ __func__
164165
#elif (defined(__DECC_VER)) /* Tru64 or VMS, and strict C89 being used, but not modern enough cc (in Tru64, -c99 not known, only -std1). */
@@ -483,7 +484,8 @@ Perl_xxx(aTHX_ ...) form for any API calls where it's used.
483484
#define gv_fetchpvn gv_fetchpvn_flags
484485

485486

486-
#define lex_stuff_pvs(pv,flags) Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
487+
#define lex_stuff_pvs(pv,flags) \
488+
Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
487489

488490
#define get_cvs(str, flags) \
489491
Perl_get_cvn_flags(aTHX_ STR_WITH_LEN(str), (flags))
@@ -710,7 +712,8 @@ based on the underlying C library functions):
710712
#define strnNE(s1,s2,l) (strncmp(s1,s2,l) != 0)
711713
#define strnEQ(s1,s2,l) (strncmp(s1,s2,l) == 0)
712714

713-
#define memEQ(s1,s2,l) (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
715+
#define memEQ(s1,s2,l) \
716+
(memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
714717
#define memNE(s1,s2,l) (! memEQ(s1,s2,l))
715718

716719
/* memEQ and memNE where second comparand is a string constant */
@@ -742,7 +745,8 @@ based on the underlying C library functions):
742745
#define memGT(s1,s2,l) (memcmp(s1,s2,l) > 0)
743746
#define memGE(s1,s2,l) (memcmp(s1,s2,l) >= 0)
744747

745-
#define memCHRs(s1,c) ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
748+
#define memCHRs(s1,c) \
749+
((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
746750

747751
/*
748752
* Character classes.
@@ -1664,7 +1668,8 @@ END_EXTERN_C
16641668
# define isPUNCT_A(c) generic_isCC_A_(c, CC_PUNCT_)
16651669
# define isSPACE_A(c) generic_isCC_A_(c, CC_SPACE_)
16661670
# define isWORDCHAR_A(c) generic_isCC_A_(c, CC_WORDCHAR_)
1667-
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII xdigits */
1671+
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII
1672+
xdigits */
16681673
# define isIDFIRST_A(c) generic_isCC_A_(c, CC_IDFIRST_)
16691674
# define isALPHA_L1(c) generic_isCC_(c, CC_ALPHA_)
16701675
# define isALPHANUMERIC_L1(c) generic_isCC_(c, CC_ALPHANUMERIC_)
@@ -2202,11 +2207,13 @@ END_EXTERN_C
22022207
#define isPRINT_uvchr(c) generic_invlist_uvchr_(CC_PRINT_, c)
22032208

22042209
#define isPUNCT_uvchr(c) generic_invlist_uvchr_(CC_PUNCT_, c)
2205-
#define isSPACE_uvchr(c) generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
2210+
#define isSPACE_uvchr(c) \
2211+
generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
22062212
#define isPSXSPC_uvchr(c) isSPACE_uvchr(c)
22072213

22082214
#define isUPPER_uvchr(c) generic_invlist_uvchr_(CC_UPPER_, c)
2209-
#define isVERTWS_uvchr(c) generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
2215+
#define isVERTWS_uvchr(c) \
2216+
generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
22102217
#define isWORDCHAR_uvchr(c) generic_invlist_uvchr_(CC_WORDCHAR_, c)
22112218
#define isXDIGIT_uvchr(c) generic_uvchr_(CC_XDIGIT_, is_XDIGIT_cp_high, c)
22122219

@@ -2751,7 +2758,8 @@ PoisonWith(0xEF) for catching access to freed memory.
27512758

27522759
#define MEM_SIZE_MAX ((MEM_SIZE)-1)
27532760

2754-
#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
2761+
#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) \
2762+
(((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
27552763

27562764
#ifdef PERL_MALLOC_WRAP
27572765

@@ -2805,7 +2813,8 @@ PoisonWith(0xEF) for catching access to freed memory.
28052813

28062814
# define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t),
28072815

2808-
# define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n))
2816+
# define PERL_STRLEN_ROUNDUP(n) \
2817+
((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n))
28092818
#else
28102819

28112820
# define MEM_WRAP_CHECK(n,t)
@@ -2865,9 +2874,12 @@ enum mem_log_type {
28652874
#endif
28662875

28672876
#ifdef PERL_MEM_LOG
2868-
#define MEM_LOG_ALLOC(n,t,a) Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2869-
#define MEM_LOG_REALLOC(n,t,v,a) Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2870-
#define MEM_LOG_FREE(a) Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
2877+
#define MEM_LOG_ALLOC(n,t,a) \
2878+
Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2879+
#define MEM_LOG_REALLOC(n,t,v,a) \
2880+
Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2881+
#define MEM_LOG_FREE(a) \
2882+
Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
28712883
#endif
28722884

28732885
#ifndef MEM_LOG_ALLOC
@@ -2880,9 +2892,12 @@ enum mem_log_type {
28802892
#define MEM_LOG_FREE(a) (a)
28812893
#endif
28822894

2883-
#define Newx(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2884-
#define Newxc(v,n,t,c) (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2885-
#define Newxz(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
2895+
#define Newx(v,n,t) \
2896+
(v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2897+
#define Newxc(v,n,t,c) \
2898+
(v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2899+
#define Newxz(v,n,t) \
2900+
(v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
28862901

28872902
#ifndef PERL_CORE
28882903
/* pre 5.9.x compatibility */
@@ -2909,22 +2924,29 @@ enum mem_log_type {
29092924
#define perl_assert_ptr(p) assert( ((void*)(p)) != 0 )
29102925

29112926

2912-
#define Move(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2913-
#define Copy(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2914-
#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
2927+
#define Move(s,d,n,t) \
2928+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2929+
#define Copy(s,d,n,t) \
2930+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2931+
#define Zero(d,n,t) \
2932+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
29152933

29162934
/* Like above, but returns a pointer to 'd' */
2917-
#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2918-
#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2919-
#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
2935+
#define MoveD(s,d,n,t) \
2936+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2937+
#define CopyD(s,d,n,t) \
2938+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2939+
#define ZeroD(d,n,t) \
2940+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
29202941

29212942
#define NewCopy(s,d,n,t) \
29222943
STMT_START { \
29232944
Newx(d,n,t); \
29242945
Copy(s,d,n,t); \
29252946
} STMT_END
29262947

2927-
#define PoisonWith(d,n,t,b) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
2948+
#define PoisonWith(d,n,t,b) \
2949+
(MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
29282950
#define PoisonNew(d,n,t) PoisonWith(d,n,t,0xAB)
29292951
#define PoisonFree(d,n,t) PoisonWith(d,n,t,0xEF)
29302952
#define Poison(d,n,t) PoisonFree(d,n,t)

hv.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
# define USE_PERL_PERTURB_KEYS 1
2626
# define PL_HASH_RAND_BITS_ENABLED PL_hash_rand_bits_enabled
2727
# endif
28-
# define PERL_HASH_ITER_BUCKET(iter) (((iter)->xhv_riter) ^ ((iter)->xhv_rand))
28+
# define PERL_HASH_ITER_BUCKET(iter) \
29+
(((iter)->xhv_riter) ^ ((iter)->xhv_rand))
2930
#endif
3031

3132
#ifdef PERL_USE_UNSHARED_KEYS_IN_LARGE_HASHES
32-
#define LARGE_HASH_HEURISTIC(hv,new_max) S_large_hash_heuristic(aTHX_ (hv), (new_max))
33+
#define LARGE_HASH_HEURISTIC(hv,new_max) \
34+
S_large_hash_heuristic(aTHX_ (hv), (new_max))
3335
#else
3436
#define LARGE_HASH_HEURISTIC(hv,new_max) 0
3537
#endif
@@ -386,8 +388,10 @@ whether it is valid to call C<HvAUX()>.
386388
#define HvUSEDKEYS(hv) (HvTOTALKEYS(hv) - HvPLACEHOLDERS_get(hv))
387389
#define HvTOTALKEYS(hv) (((XPVHV*) SvANY(hv))->xhv_keys)
388390
#define HvPLACEHOLDERS(hv) (*Perl_hv_placeholders_p(aTHX_ MUTABLE_HV(hv)))
389-
#define HvPLACEHOLDERS_get(hv) (SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0)
390-
#define HvPLACEHOLDERS_set(hv,p) Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p)
391+
#define HvPLACEHOLDERS_get(hv) \
392+
(SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0)
393+
#define HvPLACEHOLDERS_set(hv,p) \
394+
Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p)
391395

392396
/* This (now) flags whether *new* keys in the hash will be allocated from the
393397
* shared string table. We have a heuristic to call HvSHAREKEYS_off() if a hash
@@ -501,7 +505,8 @@ whether it is valid to call C<HvAUX()>.
501505
#define HV_ITERNEXT_WANTPLACEHOLDERS 0x01 /* Don't skip placeholders. */
502506

503507
#define hv_iternext(hv) hv_iternext_flags(hv, 0)
504-
#define hv_magic(hv, gv, how) sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0)
508+
#define hv_magic(hv, gv, how) \
509+
sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0)
505510
#define hv_undef(hv) Perl_hv_undef_flags(aTHX_ hv, 0)
506511

507512
#define Perl_sharepvn(pv, len, hash) HEK_KEY(share_hek(pv, len, hash))

0 commit comments

Comments
 (0)