From: Enrico Scholz Date: Sat, 8 May 2004 01:28:16 +0000 (+0000) Subject: some changes to make gcc34 happy X-Git-Tag: VERSION_0_10~40 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0fc0a49a28cbb2cd0752044b60a3dafc8834d7b;p=util-vserver.git some changes to make gcc34 happy git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1545 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/testsuite/cflags.c b/util-vserver/lib/testsuite/cflags.c index 791e515..897def8 100644 --- a/util-vserver/lib/testsuite/cflags.c +++ b/util-vserver/lib/testsuite/cflags.c @@ -28,10 +28,10 @@ #define TEST_T2F_C(X,Y,Z) assert(vc_text2cflag_compat(X,Y)==Z) -#define TEST_F2T_C(Y,X) { \ - char const *x=vc_hicflag2text_compat(X); \ - assert((x==0 && Y==0) || (x!=0 && Y!=0)); \ - if (x!=0) assert(strcmp(x, Y)==0); \ +#define TEST_F2T_C(Y,X) { \ + char const *x=vc_hicflag2text_compat(X); \ + assert((x==0 && Y==0) || (x!=0 && Y!=0)); \ + if (x!=0 && Y!=0) assert(strcmp(x, Y)==0); \ } #define TEST_LIST_C(STR,LEN,EXP,ERR_POS,ERR_LEN) { \ @@ -48,11 +48,11 @@ //---- #define TEST_T2F(X,Y,Z) assert(vc_text2cflag(X,Y)==Z) -#define TEST_F2T(Y,X) { \ - uint_least64_t x = (X); \ - char const *rc=vc_locflag2text(&x); \ - assert((rc==0 && Y==0) || (rc!=0 && Y!=0)); \ - if (rc!=0) assert(strcmp(rc, Y)==0); \ +#define TEST_F2T(Y,X) { \ + uint_least64_t x = (X); \ + char const *rc=vc_locflag2text(&x); \ + assert((rc==0 && Y==0) || (rc!=0 && Y!=0)); \ + if (rc!=0 && Y!=0) assert(strcmp(rc, Y)==0); \ } #define TEST_LIST(STR,LEN,EXP_RES,EXP_FLAG,EXP_MASK,ERR_POS,ERR_LEN) { \ struct vc_err_listparser err; \