Skip to content

M
MariaDB
Commit 3b6c3dd2 authored by serg@serg.mylan's avatar serg@serg.mylan
Browse files
Options

escaping all molty-statement macro

parent 1a0b6a7a
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 78 deletions
include/my_global.h
View file @ 3b6c3dd2
...@@ -934,19 +934,19 @@ typedef char bool; /* Ordinary boolean values 0 1 */ ...@@ -934,19 +934,19 @@ typedef char bool; /* Ordinary boolean values 0 1 */
(((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\ (((uint32) ((uchar) (A)[2])) << 16) +\
(((uint32) ((uchar) (A)[3])) << 24)) +\ (((uint32) ((uchar) (A)[3])) << 24)) +\
(((ulonglong) ((uchar) (A)[4])) << 32)) (((ulonglong) ((uchar) (A)[4])) << 32))
#define uint8korr(A) (*((ulonglong *) (A))) #define uint8korr(A) (*((ulonglong *) (A)))
#define sint8korr(A) (*((longlong *) (A))) #define sint8korr(A) (*((longlong *) (A)))
#define int2store(T,A) *((uint16*) (T))= (uint16) (A) #define int2store(T,A) *((uint16*) (T))= (uint16) (A)
#define int3store(T,A) { *(T)= (uchar) ((A));\ #define int3store(T,A) do { *(T)= (uchar) ((A));\
*(T+1)=(uchar) (((uint) (A) >> 8));\ *(T+1)=(uchar) (((uint) (A) >> 8));\
*(T+2)=(uchar) (((A) >> 16)); } *(T+2)=(uchar) (((A) >> 16)); } while (0)
#define int4store(T,A) *((long *) (T))= (long) (A) #define int4store(T,A) *((long *) (T))= (long) (A)
#define int5store(T,A) { *(T)= (uchar)((A));\ #define int5store(T,A) do { *(T)= (uchar)((A));\
*((T)+1)=(uchar) (((A) >> 8));\ *((T)+1)=(uchar) (((A) >> 8));\
*((T)+2)=(uchar) (((A) >> 16));\ *((T)+2)=(uchar) (((A) >> 16));\
*((T)+3)=(uchar) (((A) >> 24)); \ *((T)+3)=(uchar) (((A) >> 24)); \
*((T)+4)=(uchar) (((A) >> 32)); } *((T)+4)=(uchar) (((A) >> 32)); } while(0)
#define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A) #define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A)
typedef union { typedef union {
...@@ -954,13 +954,14 @@ typedef union { ...@@ -954,13 +954,14 @@ typedef union {
long m[2]; long m[2];
} doubleget_union; } doubleget_union;
#define doubleget(V,M) \ #define doubleget(V,M) \
{ doubleget_union _tmp; \ do { doubleget_union _tmp; \
_tmp.m[0] = *((long*)(M)); \ _tmp.m[0] = *((long*)(M)); \
_tmp.m[1] = *(((long*) (M))+1); \ _tmp.m[1] = *(((long*) (M))+1); \
(V) = _tmp.v; } (V) = _tmp.v; } while(0)
#define doublestore(T,V) { *((long *) T) = ((doubleget_union *)&V)->m[0]; \ #define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; } *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } } while (0)
#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)
#define float8get(V,M) doubleget((V),(M)) #define float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float)) #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define float8store(V,M) doublestore((V),(M)) #define float8store(V,M) doublestore((V),(M))
...@@ -995,7 +996,7 @@ typedef union { ...@@ -995,7 +996,7 @@ typedef union {
(((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\ (((uint32) ((uchar) (A)[2])) << 16) +\
(((uint32) ((uchar) (A)[3])) << 24)) +\ (((uint32) ((uchar) (A)[3])) << 24)) +\
(((ulonglong) ((uchar) (A)[4])) << 32)) (((ulonglong) ((uchar) (A)[4])) << 32))
#define uint8korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ #define uint8korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
(((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\ (((uint32) ((uchar) (A)[2])) << 16) +\
...@@ -1004,50 +1005,50 @@ typedef union { ...@@ -1004,50 +1005,50 @@ typedef union {
(((uint32) ((uchar) (A)[5])) << 8) +\ (((uint32) ((uchar) (A)[5])) << 8) +\
(((uint32) ((uchar) (A)[6])) << 16) +\ (((uint32) ((uchar) (A)[6])) << 16) +\
(((uint32) ((uchar) (A)[7])) << 24))) <<\ (((uint32) ((uchar) (A)[7])) << 24))) <<\
32)) 32))
#define int2store(T,A) { uint def_temp= (uint) (A) ;\ #define int2store(T,A) do { uint def_temp= (uint) (A) ;\
*((uchar*) (T))= (uchar)(def_temp); \ *((uchar*) (T))= (uchar)(def_temp); \
*((uchar*) (T+1))=(uchar)((def_temp >> 8)); } *((uchar*) (T+1))=(uchar)((def_temp >> 8)); \
#define int3store(T,A) { /*lint -save -e734 */\ } while(0)
*((uchar*)(T))=(uchar) ((A));\ #define int3store(T,A) do { /*lint -save -e734 */\
*((uchar*) (T)+1)=(uchar) (((A) >> 8));\ *((uchar*)(T))=(uchar) ((A));\
*((uchar*)(T)+2)=(uchar) (((A) >> 16)); \ *((uchar*) (T)+1)=(uchar) (((A) >> 8));\
/*lint -restore */} *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \
#define int4store(T,A) { *(T)=(char) ((A));\ /*lint -restore */} while(0)
*((T)+1)=(char) (((A) >> 8));\ #define int4store(T,A) do { *(T)=(char) ((A));\
*((T)+2)=(char) (((A) >> 16));\ *((T)+1)=(char) (((A) >> 8));\
*((T)+3)=(char) (((A) >> 24)); } *((T)+2)=(char) (((A) >> 16));\
#define int5store(T,A) { *(T)=((A));\ *((T)+3)=(char) (((A) >> 24)); } while(0)
*((T)+1)=(((A) >> 8));\ #define int5store(T,A) do { *(T)=((A));\
*((T)+2)=(((A) >> 16));\ *((T)+1)=(((A) >> 8));\
*((T)+3)=(((A) >> 24)); \ *((T)+2)=(((A) >> 16));\
*((T)+4)=(((A) >> 32)); } *((T)+3)=(((A) >> 24)); \
#define int8store(T,A) { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \ *((T)+4)=(((A) >> 32)); } while(0)
int4store((T),def_temp); \ #define int8store(T,A) do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
int4store((T+4),def_temp2); \ int4store((T),def_temp); \
} int4store((T+4),def_temp2); } while(0)
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#define float4store(T,A) { *(T)= ((byte *) &A)[3];\ #define float4store(T,A) do { *(T)= ((byte *) &A)[3];\
*((T)+1)=(char) ((byte *) &A)[2];\ *((T)+1)=(char) ((byte *) &A)[2];\
*((T)+2)=(char) ((byte *) &A)[1];\ *((T)+2)=(char) ((byte *) &A)[1];\
*((T)+3)=(char) ((byte *) &A)[0]; } *((T)+3)=(char) ((byte *) &A)[0]; } while(0)
#define float4get(V,M) { float def_temp;\ #define float4get(V,M) do { float def_temp;\
((byte*) &def_temp)[0]=(M)[3];\ ((byte*) &def_temp)[0]=(M)[3];\
((byte*) &def_temp)[1]=(M)[2];\ ((byte*) &def_temp)[1]=(M)[2];\
((byte*) &def_temp)[2]=(M)[1];\ ((byte*) &def_temp)[2]=(M)[1];\
((byte*) &def_temp)[3]=(M)[0];\ ((byte*) &def_temp)[3]=(M)[0];\
(V)=def_temp; } (V)=def_temp; } while(0)
#define float8store(T,V) { *(T)= ((byte *) &V)[7];\ #define float8store(T,V) do { *(T)= ((byte *) &V)[7];\
*((T)+1)=(char) ((byte *) &V)[6];\ *((T)+1)=(char) ((byte *) &V)[6];\
*((T)+2)=(char) ((byte *) &V)[5];\ *((T)+2)=(char) ((byte *) &V)[5];\
*((T)+3)=(char) ((byte *) &V)[4];\ *((T)+3)=(char) ((byte *) &V)[4];\
*((T)+4)=(char) ((byte *) &V)[3];\ *((T)+4)=(char) ((byte *) &V)[3];\
*((T)+5)=(char) ((byte *) &V)[2];\ *((T)+5)=(char) ((byte *) &V)[2];\
*((T)+6)=(char) ((byte *) &V)[1];\ *((T)+6)=(char) ((byte *) &V)[1];\
*((T)+7)=(char) ((byte *) &V)[0]; } *((T)+7)=(char) ((byte *) &V)[0]; } while(0)
#define float8get(V,M) { double def_temp;\ #define float8get(V,M) do { double def_temp;\
((byte*) &def_temp)[0]=(M)[7];\ ((byte*) &def_temp)[0]=(M)[7];\
((byte*) &def_temp)[1]=(M)[6];\ ((byte*) &def_temp)[1]=(M)[6];\
((byte*) &def_temp)[2]=(M)[5];\ ((byte*) &def_temp)[2]=(M)[5];\
...@@ -1056,21 +1057,21 @@ typedef union { ...@@ -1056,21 +1057,21 @@ typedef union {
((byte*) &def_temp)[5]=(M)[2];\ ((byte*) &def_temp)[5]=(M)[2];\
((byte*) &def_temp)[6]=(M)[1];\ ((byte*) &def_temp)[6]=(M)[1];\
((byte*) &def_temp)[7]=(M)[0];\ ((byte*) &def_temp)[7]=(M)[0];\
(V) = def_temp; } (V) = def_temp; } while(0)
#else #else
#define float4get(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float)) #define float4get(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
#define float4store(V,M) memcpy_fixed((byte*) V,(byte*) (&M),sizeof(float)) #define float4store(V,M) memcpy_fixed((byte*) V,(byte*) (&M),sizeof(float))
#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) #if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
#define doublestore(T,V) { *(T)= ((byte *) &V)[4];\ #define doublestore(T,V) do { *(T)= ((byte *) &V)[4];\
*((T)+1)=(char) ((byte *) &V)[5];\ *((T)+1)=(char) ((byte *) &V)[5];\
*((T)+2)=(char) ((byte *) &V)[6];\ *((T)+2)=(char) ((byte *) &V)[6];\
*((T)+3)=(char) ((byte *) &V)[7];\ *((T)+3)=(char) ((byte *) &V)[7];\
*((T)+4)=(char) ((byte *) &V)[0];\ *((T)+4)=(char) ((byte *) &V)[0];\
*((T)+5)=(char) ((byte *) &V)[1];\ *((T)+5)=(char) ((byte *) &V)[1];\
*((T)+6)=(char) ((byte *) &V)[2];\ *((T)+6)=(char) ((byte *) &V)[2];\
*((T)+7)=(char) ((byte *) &V)[3]; } *((T)+7)=(char) ((byte *) &V)[3]; } while(0)
#define doubleget(V,M) { double def_temp;\ #define doubleget(V,M) do { double def_temp;\
((byte*) &def_temp)[0]=(M)[4];\ ((byte*) &def_temp)[0]=(M)[4];\
((byte*) &def_temp)[1]=(M)[5];\ ((byte*) &def_temp)[1]=(M)[5];\
((byte*) &def_temp)[2]=(M)[6];\ ((byte*) &def_temp)[2]=(M)[6];\
...@@ -1079,7 +1080,7 @@ typedef union { ...@@ -1079,7 +1080,7 @@ typedef union {
((byte*) &def_temp)[5]=(M)[1];\ ((byte*) &def_temp)[5]=(M)[1];\
((byte*) &def_temp)[6]=(M)[2];\ ((byte*) &def_temp)[6]=(M)[2];\
((byte*) &def_temp)[7]=(M)[3];\ ((byte*) &def_temp)[7]=(M)[3];\
(V) = def_temp; } (V) = def_temp; } while(0)
#endif /* __FLOAT_WORD_ORDER */ #endif /* __FLOAT_WORD_ORDER */
#define float8get(V,M) doubleget((V),(M)) #define float8get(V,M) doubleget((V),(M))
...@@ -1096,29 +1097,29 @@ typedef union { ...@@ -1096,29 +1097,29 @@ typedef union {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#define ushortget(V,M) { V = (uint16) (((uint16) ((uchar) (M)[1]))+\ #define ushortget(V,M) do { V = (uint16) (((uint16) ((uchar) (M)[1]))+\
((uint16) ((uint16) (M)[0]) << 8)); } ((uint16) ((uint16) (M)[0]) << 8)); } while(0)
#define shortget(V,M) { V = (short) (((short) ((uchar) (M)[1]))+\ #define shortget(V,M) do { V = (short) (((short) ((uchar) (M)[1]))+\
((short) ((short) (M)[0]) << 8)); } ((short) ((short) (M)[0]) << 8)); } while(0)
#define longget(V,M) { int32 def_temp;\ #define longget(V,M) do { int32 def_temp;\
((byte*) &def_temp)[0]=(M)[0];\ ((byte*) &def_temp)[0]=(M)[0];\
((byte*) &def_temp)[1]=(M)[1];\ ((byte*) &def_temp)[1]=(M)[1];\
((byte*) &def_temp)[2]=(M)[2];\ ((byte*) &def_temp)[2]=(M)[2];\
((byte*) &def_temp)[3]=(M)[3];\ ((byte*) &def_temp)[3]=(M)[3];\
(V)=def_temp; } (V)=def_temp; } while(0)
#define ulongget(V,M) { uint32 def_temp;\ #define ulongget(V,M) do { uint32 def_temp;\
((byte*) &def_temp)[0]=(M)[0];\ ((byte*) &def_temp)[0]=(M)[0];\
((byte*) &def_temp)[1]=(M)[1];\ ((byte*) &def_temp)[1]=(M)[1];\
((byte*) &def_temp)[2]=(M)[2];\ ((byte*) &def_temp)[2]=(M)[2];\
((byte*) &def_temp)[3]=(M)[3];\ ((byte*) &def_temp)[3]=(M)[3];\
(V)=def_temp; } (V)=def_temp; } while(0)
#define shortstore(T,A) { uint def_temp=(uint) (A) ;\ #define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
*(T+1)=(char)(def_temp); \ *(T+1)=(char)(def_temp); \
*(T+0)=(char)(def_temp >> 8); } *(T+0)=(char)(def_temp >> 8); } while(0)
#define longstore(T,A) { *((T)+3)=((A));\ #define longstore(T,A) do { *((T)+3)=((A));\
*((T)+2)=(((A) >> 8));\ *((T)+2)=(((A) >> 8));\
*((T)+1)=(((A) >> 16));\ *((T)+1)=(((A) >> 16));\
*((T)+0)=(((A) >> 24)); } *((T)+0)=(((A) >> 24)); } while(0)
#define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double)) #define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double)) #define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
...@@ -1127,10 +1128,10 @@ typedef union { ...@@ -1127,10 +1128,10 @@ typedef union {
#else #else
#define ushortget(V,M) { V = uint2korr(M); } #define ushortget(V,M) do { V = uint2korr(M); } while(0)
#define shortget(V,M) { V = sint2korr(M); } #define shortget(V,M) do { V = sint2korr(M); } while(0)
#define longget(V,M) { V = sint4korr(M); } #define longget(V,M) do { V = sint4korr(M); } while(0)
#define ulongget(V,M) { V = uint4korr(M); } #define ulongget(V,M) do { V = uint4korr(M); } while(0)
#define shortstore(T,V) int2store(T,V) #define shortstore(T,V) int2store(T,V)
#define longstore(T,V) int4store(T,V) #define longstore(T,V) int4store(T,V)
#ifndef doubleget #ifndef doubleget
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7