diff options
| -rw-r--r-- | src/cmd/eqn/paren.c | 2 | ||||
| -rw-r--r-- | src/cmd/pic/picl.lx | 2 | ||||
| -rw-r--r-- | src/cmd/spell/sprog.c | 2 | ||||
| -rw-r--r-- | src/libsec/port/aes.c | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/cmd/eqn/paren.c b/src/cmd/eqn/paren.c index bb019bf7..01941e32 100644 --- a/src/cmd/eqn/paren.c +++ b/src/cmd/eqn/paren.c @@ -21,7 +21,7 @@ void paren(int leftc, int p1, int rightc) n = 1; m = n - 2; if (leftc == '{' || rightc == '}') { - n = n%2 ? n : ++n; + n = n%2 ? n : n+1; if (n < 3) n = 3; m = n-3; diff --git a/src/cmd/pic/picl.lx b/src/cmd/pic/picl.lx index f5a9c155..da29d246 100644 --- a/src/cmd/pic/picl.lx +++ b/src/cmd/pic/picl.lx @@ -29,7 +29,7 @@ int yylook(void); int yywrap(void); #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 char cbuf[CBUFLEN]; int c, clen, cflag, delim; diff --git a/src/cmd/spell/sprog.c b/src/cmd/spell/sprog.c index 8d5519ef..971848e1 100644 --- a/src/cmd/spell/sprog.c +++ b/src/cmd/spell/sprog.c @@ -978,7 +978,7 @@ trypref(char* ep, char* a, int lev, int flag) deriv[lev+1].mesg = pp; deriv[lev+1].type = 0; } - while(tp=lookuppref((uchar**)&bp,ep)) { + while(tp=lookuppref((uchar**)(void*)&bp,ep)) { *pp++ = '+'; cp = tp->s; while(pp<space+sizeof(space) && (*pp = *cp++)) diff --git a/src/libsec/port/aes.c b/src/libsec/port/aes.c index dda9c8a5..cdcb9bb5 100644 --- a/src/libsec/port/aes.c +++ b/src/libsec/port/aes.c @@ -43,7 +43,9 @@ static const u32 Td3[256]; static const u8 Te4[256]; 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 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 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. */ +#ifdef NOTUSED static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { int Nr, i, j; u32 temp; @@ -994,6 +997,7 @@ static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int } return Nr; } +#endif 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; |