diff options
| author | Paul Mackerras <paulus@samba.org> | 2013-02-03 17:51:12 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2013-02-03 17:51:12 +1100 |
| commit | 3e3acf1ba2b3046c072a42c19164788a9e419bd1 (patch) | |
| tree | 7836587b7656dd13fdf49bdfaf9d4a9c035f879a /pppdump | |
| parent | 9617a7eb137f4fee62799a677a9ecf8d834db3f5 (diff) | |
| download | ppp-3e3acf1ba2b3046c072a42c19164788a9e419bd1.tar.gz | |
pppdump: Eliminate some compiler warnings
gcc lacks the -fyes-actually-I-do-know-the-C-operator-precedence-rules
option, so add some parentheses to shut it up. Also remove some unused
variables.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'pppdump')
| -rw-r--r-- | pppdump/bsd-comp.c | 12 | ||||
| -rw-r--r-- | pppdump/deflate.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pppdump/bsd-comp.c b/pppdump/bsd-comp.c index 1413326..966e958 100644 --- a/pppdump/bsd-comp.c +++ b/pppdump/bsd-comp.c @@ -383,7 +383,7 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp) || options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION || BSD_NBITS(options[2]) != db->maxbits - || decomp && db->lens == NULL) + || (decomp && db->lens == NULL)) return 0; if (decomp) { @@ -556,11 +556,11 @@ bsd_decompress(state, cmsg, inlen, dmp, outlenp) u_int n_bits = db->n_bits; u_int tgtbitno = 32-n_bits; /* bitno when we have a code */ struct bsd_dict *dictp; - int explen, i, seq, len; + int explen, seq, len; u_int incode, oldcode, finchar; u_char *p, *rptr, *wptr; int ilen; - int dlen, space, codelen, extra; + int codelen, extra; rptr = cmsg; if (*rptr == 0) @@ -616,12 +616,12 @@ bsd_decompress(state, cmsg, inlen, dmp, outlenp) } if (incode > max_ent + 2 || incode > db->maxmaxcode - || incode > max_ent && oldcode == CLEAR) { + || (incode > max_ent && oldcode == CLEAR)) { if (db->debug) { printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ", db->unit, incode, oldcode); - printf("max_ent=0x%x dlen=%d seqno=%d\n", - max_ent, dlen, db->seqno); + printf("max_ent=0x%x seqno=%d\n", + max_ent, db->seqno); } return DECOMP_FATALERROR; /* probably a bug */ } diff --git a/pppdump/deflate.c b/pppdump/deflate.c index 0136966..43c9c51 100644 --- a/pppdump/deflate.c +++ b/pppdump/deflate.c @@ -237,8 +237,8 @@ z_decompress(arg, mi, inlen, mo, outlenp) { struct deflate_state *state = (struct deflate_state *) arg; u_char *rptr, *wptr; - int rlen, olen, ospace; - int seq, i, flush, r, decode_proto; + int rlen, olen; + int seq, r; rptr = mi; if (*rptr == 0) |