diff options
| author | Yves Orton <demerphq@gmail.com> | 2019-11-06 00:32:06 +0100 |
|---|---|---|
| committer | Yves Orton <demerphq@gmail.com> | 2019-11-06 00:32:06 +0100 |
| commit | cc8ba724ccabff255f384ab68d6f6806ac2eae7c (patch) | |
| tree | 5c4dab35fc944bafc782364bd3c3fcaa4014ecac /hv_macro.h | |
| parent | ed16b18d62c264e7e9331ea67931b66b7d976bb9 (diff) | |
| download | perl-cc8ba724ccabff255f384ab68d6f6806ac2eae7c.tar.gz | |
add defensive parens
Diffstat (limited to 'hv_macro.h')
| -rw-r--r-- | hv_macro.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/hv_macro.h b/hv_macro.h index dee83253d0..938301733b 100644 --- a/hv_macro.h +++ b/hv_macro.h @@ -30,47 +30,47 @@ */ #ifndef U8TO16_LE - #define _shifted_octet(type,ptr,idx,shift) (((type)(((U8*)ptr)[idx]))<<shift) + #define _shifted_octet(type,ptr,idx,shift) (((type)(((U8*)(ptr))[(idx)]))<<(shift)) #if (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) #ifdef USE_UNALIGNED_PTR_DEREF #define U8TO16_LE(ptr) (*((const U16*)(ptr))) #define U8TO32_LE(ptr) (*((const U32*)(ptr))) #define U8TO64_LE(ptr) (*((const U64*)(ptr))) #else - #define U8TO16_LE(ptr) (_shifted_octet(U16,ptr,0, 0)|\ - _shifted_octet(U16,ptr,1, 8)) + #define U8TO16_LE(ptr) (_shifted_octet(U16,(ptr),0, 0)|\ + _shifted_octet(U16,(ptr),1, 8)) - #define U8TO32_LE(ptr) (_shifted_octet(U32,ptr,0, 0)|\ - _shifted_octet(U32,ptr,1, 8)|\ - _shifted_octet(U32,ptr,2,16)|\ - _shifted_octet(U32,ptr,3,24)) + #define U8TO32_LE(ptr) (_shifted_octet(U32,(ptr),0, 0)|\ + _shifted_octet(U32,(ptr),1, 8)|\ + _shifted_octet(U32,(ptr),2,16)|\ + _shifted_octet(U32,(ptr),3,24)) - #define U8TO64_LE(ptr) (_shifted_octet(U64,ptr,0, 0)|\ - _shifted_octet(U64,ptr,1, 8)|\ - _shifted_octet(U64,ptr,2,16)|\ - _shifted_octet(U64,ptr,3,24)|\ - _shifted_octet(U64,ptr,4,32)|\ - _shifted_octet(U64,ptr,5,40)|\ - _shifted_octet(U64,ptr,6,48)|\ - _shifted_octet(U64,ptr,7,56)) + #define U8TO64_LE(ptr) (_shifted_octet(U64,(ptr),0, 0)|\ + _shifted_octet(U64,(ptr),1, 8)|\ + _shifted_octet(U64,(ptr),2,16)|\ + _shifted_octet(U64,(ptr),3,24)|\ + _shifted_octet(U64,(ptr),4,32)|\ + _shifted_octet(U64,(ptr),5,40)|\ + _shifted_octet(U64,(ptr),6,48)|\ + _shifted_octet(U64,(ptr),7,56)) #endif #elif (BYTEORDER == 0x4321 || BYTEORDER == 0x87654321) - #define U8TO16_LE(ptr) (_shifted_octet(U16,ptr,1, 0)|\ - _shifted_octet(U16,ptr,0, 8)) + #define U8TO16_LE(ptr) (_shifted_octet(U16,(ptr),1, 0)|\ + _shifted_octet(U16,(ptr),0, 8)) - #define U8TO32_LE(ptr) (_shifted_octet(U32,ptr,3, 0)|\ - _shifted_octet(U32,ptr,2, 8)|\ - _shifted_octet(U32,ptr,1,16)|\ - _shifted_octet(U32,ptr,0,24)) + #define U8TO32_LE(ptr) (_shifted_octet(U32,(ptr),3, 0)|\ + _shifted_octet(U32,(ptr),2, 8)|\ + _shifted_octet(U32,(ptr),1,16)|\ + _shifted_octet(U32,(ptr),0,24)) - #define U8TO64_LE(ptr) (_shifted_octet(U64,ptr,7, 0)|\ - _shifted_octet(U64,ptr,6, 8)|\ - _shifted_octet(U64,ptr,5,16)|\ - _shifted_octet(U64,ptr,4,24)|\ - _shifted_octet(U64,ptr,3,32)|\ - _shifted_octet(U64,ptr,2,40)|\ - _shifted_octet(U64,ptr,1,48)|\ - _shifted_octet(U64,ptr,0,56)) + #define U8TO64_LE(ptr) (_shifted_octet(U64,(ptr),7, 0)|\ + _shifted_octet(U64,(ptr),6, 8)|\ + _shifted_octet(U64,(ptr),5,16)|\ + _shifted_octet(U64,(ptr),4,24)|\ + _shifted_octet(U64,(ptr),3,32)|\ + _shifted_octet(U64,(ptr),2,40)|\ + _shifted_octet(U64,(ptr),1,48)|\ + _shifted_octet(U64,(ptr),0,56)) #endif #endif |