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>

diff --git a/pppdump/bsd-comp.c b/pppdump/bsd-comp.c
index 141332665bd85a965f2540185b4e68ff23095293..966e958a1aa8bdd183ece8d384c3621b326026f0 100644 (file)
--- 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 01369660683846d96878d9ca39ac0d4d860ea5b9..43c9c51c858f59c93c0fad587cb6bef9c8267a40 100644 (file)
--- 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)