rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more missing 'do { ... } while (0)' in missing macros. Without it, 

these macros fail in if/else cases:

#define X \
{ \
	... \
}


{

	if (...)
		X;
	else
		...
}

with proper setup:

#define X \
do { \
	... \
} while (0)

it works fine.
This commit is contained in:
Bruce Momjian 2001-10-25 00:55:48 +00:00
parent 309a04f5b8
commit b4a57b0648
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_resetxlog/pg_resetxlog.c
View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.6 2001/07/19 02:12:34 tgl Exp $ * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.7 2001/10/25 00:55:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -273,7 +273,7 @@ static uint32 crc_tableV0[] = {
#define INIT_CRC64V0(crc) ((crc).crc1 = 0xffffffff, (crc).crc2 = 0xffffffff) #define INIT_CRC64V0(crc) ((crc).crc1 = 0xffffffff, (crc).crc2 = 0xffffffff)
#define FIN_CRC64V0(crc) ((crc).crc1 ^= 0xffffffff, (crc).crc2 ^= 0xffffffff) #define FIN_CRC64V0(crc) ((crc).crc1 ^= 0xffffffff, (crc).crc2 ^= 0xffffffff)
#define COMP_CRC64V0(crc, data, len) \ #define COMP_CRC64V0(crc, data, len) \
{\ do {\
uint32 __c1 = (crc).crc1;\ uint32 __c1 = (crc).crc1;\
uint32 __c2 = (crc).crc2;\ uint32 __c2 = (crc).crc2;\
char *__data = (char *) (data);\ char *__data = (char *) (data);\
@ -289,7 +289,7 @@ static uint32 crc_tableV0[] = {
__c1 = crc_tableV0[(__c1 ^ *__data++) & 0xff] ^ (__c1 >> 8);\ __c1 = crc_tableV0[(__c1 ^ *__data++) & 0xff] ^ (__c1 >> 8);\
(crc).crc1 = __c1;\ (crc).crc1 = __c1;\
(crc).crc2 = __c2;\ (crc).crc2 = __c2;\
} } while (0)
#define EQ_CRC64V0(c1,c2) ((c1).crc1 == (c2).crc1 && (c1).crc2 == (c2).crc2) #define EQ_CRC64V0(c1,c2) ((c1).crc1 == (c2).crc1 && (c1).crc2 == (c2).crc2)

4
contrib/pgcrypto/crypt-blowfish.c
View File

@ -359,13 +359,13 @@ static unsigned char BF_atoi64[0x60] = {
}; };
#define BF_safe_atoi64(dst, src) \ #define BF_safe_atoi64(dst, src) \
{ \ do { \
tmp = (unsigned char)(src); \ tmp = (unsigned char)(src); \
if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \ if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
tmp = BF_atoi64[tmp]; \ tmp = BF_atoi64[tmp]; \
if (tmp > 63) return -1; \ if (tmp > 63) return -1; \
(dst) = tmp; \ (dst) = tmp; \
} } while (0)
static int BF_decode(BF_word *dst, const char *src, int size) static int BF_decode(BF_word *dst, const char *src, int size)
{ {

12
contrib/pgcrypto/rijndael.c
View File

@ -255,25 +255,25 @@ gen_tabs(void)
/* initialise the key schedule from the user supplied key */ /* initialise the key schedule from the user supplied key */
#define loop4(i) \ #define loop4(i) \
{ t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \ do { t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \
t ^= e_key[4 * i]; e_key[4 * i + 4] = t; \ t ^= e_key[4 * i]; e_key[4 * i + 4] = t; \
t ^= e_key[4 * i + 1]; e_key[4 * i + 5] = t; \ t ^= e_key[4 * i + 1]; e_key[4 * i + 5] = t; \
t ^= e_key[4 * i + 2]; e_key[4 * i + 6] = t; \ t ^= e_key[4 * i + 2]; e_key[4 * i + 6] = t; \
t ^= e_key[4 * i + 3]; e_key[4 * i + 7] = t; \ t ^= e_key[4 * i + 3]; e_key[4 * i + 7] = t; \
} } while (0)
#define loop6(i) \ #define loop6(i) \
{ t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \ do { t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \
t ^= e_key[6 * i]; e_key[6 * i + 6] = t; \ t ^= e_key[6 * i]; e_key[6 * i + 6] = t; \
t ^= e_key[6 * i + 1]; e_key[6 * i + 7] = t; \ t ^= e_key[6 * i + 1]; e_key[6 * i + 7] = t; \
t ^= e_key[6 * i + 2]; e_key[6 * i + 8] = t; \ t ^= e_key[6 * i + 2]; e_key[6 * i + 8] = t; \
t ^= e_key[6 * i + 3]; e_key[6 * i + 9] = t; \ t ^= e_key[6 * i + 3]; e_key[6 * i + 9] = t; \
t ^= e_key[6 * i + 4]; e_key[6 * i + 10] = t; \ t ^= e_key[6 * i + 4]; e_key[6 * i + 10] = t; \
t ^= e_key[6 * i + 5]; e_key[6 * i + 11] = t; \ t ^= e_key[6 * i + 5]; e_key[6 * i + 11] = t; \
} } while (0)
#define loop8(i) \ #define loop8(i) \
{ t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \ do { t = ls_box(rotr(t, 8)) ^ rco_tab[i]; \
t ^= e_key[8 * i]; e_key[8 * i + 8] = t; \ t ^= e_key[8 * i]; e_key[8 * i + 8] = t; \
t ^= e_key[8 * i + 1]; e_key[8 * i + 9] = t; \ t ^= e_key[8 * i + 1]; e_key[8 * i + 9] = t; \
t ^= e_key[8 * i + 2]; e_key[8 * i + 10] = t; \ t ^= e_key[8 * i + 2]; e_key[8 * i + 10] = t; \
@ -283,7 +283,7 @@ gen_tabs(void)
t ^= e_key[8 * i + 5]; e_key[8 * i + 13] = t; \ t ^= e_key[8 * i + 5]; e_key[8 * i + 13] = t; \
t ^= e_key[8 * i + 6]; e_key[8 * i + 14] = t; \ t ^= e_key[8 * i + 6]; e_key[8 * i + 14] = t; \
t ^= e_key[8 * i + 7]; e_key[8 * i + 15] = t; \ t ^= e_key[8 * i + 7]; e_key[8 * i + 15] = t; \
} } while (0)
rijndael_ctx * rijndael_ctx *
rijndael_set_key(rijndael_ctx *ctx, const u4byte *in_key, const u4byte key_len, rijndael_set_key(rijndael_ctx *ctx, const u4byte *in_key, const u4byte key_len,