@@ -457,7 +457,8 @@ Perl_xxx(aTHX_ ...) form for any API calls where it's used.
457
457
Perl_sv_catxmlpvn(aTHX_ dsv, STR_WITH_LEN(str), utf8)
458
458
459
459
460
- #define lex_stuff_pvs (pv ,flags ) Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
460
+ #define lex_stuff_pvs (pv ,flags ) \
461
+ Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
461
462
462
463
#define get_cvs (str , flags ) \
463
464
Perl_get_cvn_flags(aTHX_ STR_WITH_LEN(str), (flags))
@@ -684,7 +685,8 @@ based on the underlying C library functions):
684
685
#define strnNE (s1 ,s2 ,l ) (strncmp(s1,s2,l) != 0)
685
686
#define strnEQ (s1 ,s2 ,l ) (strncmp(s1,s2,l) == 0)
686
687
687
- #define memEQ (s1 ,s2 ,l ) (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
688
+ #define memEQ (s1 ,s2 ,l ) \
689
+ (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
688
690
#define memNE (s1 ,s2 ,l ) (! memEQ(s1,s2,l))
689
691
690
692
/* memEQ and memNE where second comparand is a string constant */
@@ -716,7 +718,8 @@ based on the underlying C library functions):
716
718
#define memGT (s1 ,s2 ,l ) (memcmp(s1,s2,l) > 0)
717
719
#define memGE (s1 ,s2 ,l ) (memcmp(s1,s2,l) >= 0)
718
720
719
- #define memCHRs (s1 ,c ) ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
721
+ #define memCHRs (s1 ,c ) \
722
+ ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
720
723
721
724
/*
722
725
* Character classes.
@@ -1638,7 +1641,8 @@ END_EXTERN_C
1638
1641
# define isPUNCT_A (c ) generic_isCC_A_(c, CC_PUNCT_)
1639
1642
# define isSPACE_A (c ) generic_isCC_A_(c, CC_SPACE_)
1640
1643
# define isWORDCHAR_A (c ) generic_isCC_A_(c, CC_WORDCHAR_)
1641
- # define isXDIGIT_A (c ) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII xdigits */
1644
+ # define isXDIGIT_A (c ) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII
1645
+ xdigits */
1642
1646
# define isIDFIRST_A (c ) generic_isCC_A_(c, CC_IDFIRST_)
1643
1647
# define isALPHA_L1 (c ) generic_isCC_(c, CC_ALPHA_)
1644
1648
# define isALPHANUMERIC_L1 (c ) generic_isCC_(c, CC_ALPHANUMERIC_)
@@ -2170,11 +2174,13 @@ END_EXTERN_C
2170
2174
#define isPRINT_uvchr (c ) generic_invlist_uvchr_(CC_PRINT_, c)
2171
2175
2172
2176
#define isPUNCT_uvchr (c ) generic_invlist_uvchr_(CC_PUNCT_, c)
2173
- #define isSPACE_uvchr (c ) generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
2177
+ #define isSPACE_uvchr (c ) \
2178
+ generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
2174
2179
#define isPSXSPC_uvchr (c ) isSPACE_uvchr(c)
2175
2180
2176
2181
#define isUPPER_uvchr (c ) generic_invlist_uvchr_(CC_UPPER_, c)
2177
- #define isVERTWS_uvchr (c ) generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
2182
+ #define isVERTWS_uvchr (c ) \
2183
+ generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
2178
2184
#define isWORDCHAR_uvchr (c ) generic_invlist_uvchr_(CC_WORDCHAR_, c)
2179
2185
#define isXDIGIT_uvchr (c ) generic_uvchr_(CC_XDIGIT_, is_XDIGIT_cp_high, c)
2180
2186
@@ -2715,7 +2721,8 @@ PoisonWith(0xEF) for catching access to freed memory.
2715
2721
2716
2722
#define MEM_SIZE_MAX ((MEM_SIZE)-1)
2717
2723
2718
- #define _PERL_STRLEN_ROUNDUP_UNCHECKED (n ) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
2724
+ #define _PERL_STRLEN_ROUNDUP_UNCHECKED (n ) \
2725
+ (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
2719
2726
2720
2727
#ifdef PERL_MALLOC_WRAP
2721
2728
@@ -2769,7 +2776,8 @@ PoisonWith(0xEF) for catching access to freed memory.
2769
2776
2770
2777
# define MEM_WRAP_CHECK_ (n ,t ) MEM_WRAP_CHECK(n,t),
2771
2778
2772
- # 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))
2779
+ # define PERL_STRLEN_ROUNDUP (n ) \
2780
+ ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n))
2773
2781
#else
2774
2782
2775
2783
# define MEM_WRAP_CHECK (n ,t )
@@ -2829,9 +2837,12 @@ enum mem_log_type {
2829
2837
#endif
2830
2838
2831
2839
#ifdef PERL_MEM_LOG
2832
- #define MEM_LOG_ALLOC (n ,t ,a ) Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2833
- #define MEM_LOG_REALLOC (n ,t ,v ,a ) Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2834
- #define MEM_LOG_FREE (a ) Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
2840
+ #define MEM_LOG_ALLOC (n ,t ,a ) \
2841
+ Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2842
+ #define MEM_LOG_REALLOC (n ,t ,v ,a ) \
2843
+ Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2844
+ #define MEM_LOG_FREE (a ) \
2845
+ Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
2835
2846
#endif
2836
2847
2837
2848
#ifndef MEM_LOG_ALLOC
@@ -2844,9 +2855,12 @@ enum mem_log_type {
2844
2855
#define MEM_LOG_FREE (a ) (a)
2845
2856
#endif
2846
2857
2847
- #define Newx (v ,n ,t ) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2848
- #define Newxc (v ,n ,t ,c ) (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2849
- #define Newxz (v ,n ,t ) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
2858
+ #define Newx (v ,n ,t ) \
2859
+ (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2860
+ #define Newxc (v ,n ,t ,c ) \
2861
+ (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2862
+ #define Newxz (v ,n ,t ) \
2863
+ (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
2850
2864
2851
2865
#ifndef PERL_CORE
2852
2866
/* pre 5.9.x compatibility */
@@ -2873,16 +2887,23 @@ enum mem_log_type {
2873
2887
#define perl_assert_ptr (p ) assert( ((void*)(p)) != 0 )
2874
2888
2875
2889
2876
- #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)))
2877
- #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)))
2878
- #define Zero (d ,n ,t ) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
2890
+ #define Move (s ,d ,n ,t ) \
2891
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2892
+ #define Copy (s ,d ,n ,t ) \
2893
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2894
+ #define Zero (d ,n ,t ) \
2895
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
2879
2896
2880
2897
/* Like above, but returns a pointer to 'd' */
2881
- #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)))
2882
- #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)))
2883
- #define ZeroD (d ,n ,t ) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
2884
-
2885
- #define PoisonWith (d ,n ,t ,b ) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
2898
+ #define MoveD (s ,d ,n ,t ) \
2899
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2900
+ #define CopyD (s ,d ,n ,t ) \
2901
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2902
+ #define ZeroD (d ,n ,t ) \
2903
+ (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
2904
+
2905
+ #define PoisonWith (d ,n ,t ,b ) \
2906
+ (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
2886
2907
#define PoisonNew (d ,n ,t ) PoisonWith(d,n,t,0xAB)
2887
2908
#define PoisonFree (d ,n ,t ) PoisonWith(d,n,t,0xEF)
2888
2909
#define Poison (d ,n ,t ) PoisonFree(d,n,t)
0 commit comments