silence various warnings

This commit is contained in:
rsc 2004-12-27 19:13:31 +00:00
parent b3efcdbf59
commit 73bfbacb24
4 changed files with 7 additions and 3 deletions

View file

@ -21,7 +21,7 @@ void paren(int leftc, int p1, int rightc)
n = 1; n = 1;
m = n - 2; m = n - 2;
if (leftc == '{' || rightc == '}') { if (leftc == '{' || rightc == '}') {
n = n%2 ? n : ++n; n = n%2 ? n : n+1;
if (n < 3) if (n < 3)
n = 3; n = 3;
m = n-3; m = n-3;

View file

@ -29,7 +29,7 @@ int yylook(void);
int yywrap(void); int yywrap(void);
#define CADD cbuf[clen++]=yytext[0]; \ #define CADD cbuf[clen++]=yytext[0]; \
if (clen>=CBUFLEN-1) { ERROR "string too long", cbuf WARNING; BEGIN A; } if (clen>=CBUFLEN-1) { ERROR "string too long" WARNING; BEGIN A; }
#define CBUFLEN 500 #define CBUFLEN 500
char cbuf[CBUFLEN]; char cbuf[CBUFLEN];
int c, clen, cflag, delim; int c, clen, cflag, delim;

View file

@ -978,7 +978,7 @@ trypref(char* ep, char* a, int lev, int flag)
deriv[lev+1].mesg = pp; deriv[lev+1].mesg = pp;
deriv[lev+1].type = 0; deriv[lev+1].type = 0;
} }
while(tp=lookuppref((uchar**)&bp,ep)) { while(tp=lookuppref((uchar**)(void*)&bp,ep)) {
*pp++ = '+'; *pp++ = '+';
cp = tp->s; cp = tp->s;
while(pp<space+sizeof(space) && (*pp = *cp++)) while(pp<space+sizeof(space) && (*pp = *cp++))

View file

@ -43,7 +43,9 @@ static const u32 Td3[256];
static const u8 Te4[256]; static const u8 Te4[256];
static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
/*
static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
*/
static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
static void rijndaelEncrypt(const u32int rk[], int Nr, const uchar pt[16], uchar ct[16]); static void rijndaelEncrypt(const u32int rk[], int Nr, const uchar pt[16], uchar ct[16]);
static void rijndaelDecrypt(const u32int rk[], int Nr, const uchar ct[16], uchar pt[16]); static void rijndaelDecrypt(const u32int rk[], int Nr, const uchar ct[16], uchar pt[16]);
@ -955,6 +957,7 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
* *
* @return the number of rounds for the given cipher key size. * @return the number of rounds for the given cipher key size.
*/ */
#ifdef NOTUSED
static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) {
int Nr, i, j; int Nr, i, j;
u32 temp; u32 temp;
@ -994,6 +997,7 @@ static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
} }
return Nr; return Nr;
} }
#endif
static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) { static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) {
u32 s0, s1, s2, s3, t0, t1, t2, t3; u32 s0, s1, s2, s3, t0, t1, t2, t3;