minimize diffs from version in NetBSD distrib

[ppp.git] / netbsd-1.1 / bsd-comp.c

diff --git a/netbsd-1.1/bsd-comp.c b/netbsd-1.1/bsd-comp.c
index a5715e4897597ac5f232620e8cee71188e504c48..35880b363c52ed018790d83e8c24715cdfe4fbfa 100644 (file)
--- a/netbsd-1.1/bsd-comp.c
+++ b/netbsd-1.1/bsd-comp.c
@@ -1,4 +1,4 @@
-/*     $Id: bsd-comp.c,v 1.3 1996/04/04 02:48:56 paulus Exp $  */
+/*     $Id: bsd-comp.c,v 1.5 1996/07/01 05:31:02 paulus Exp $  */
 
 /* Because this code is derived from the 4.3BSD compress source:
  *
@@ -416,7 +416,7 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
        || 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) {
@@ -714,7 +714,6 @@ bsd_incomp(state, dmsg)
     if (ent < 0x21 || ent > 0xf9)
        return;
 
-    db->incomp_count++;
     db->seqno++;
     ilen = 1;          /* count the protocol as 1 byte */
     rptr += PPP_HDRLEN;
@@ -944,7 +943,7 @@ bsd_decompress(state, cmp, dmpp)
        }
 
        if (incode > max_ent + 2 || incode > db->maxmaxcode
-           || incode > max_ent && oldcode == CLEAR) {
+           || (incode > max_ent && oldcode == CLEAR)) {
            m_freem(mret);
            if (db->debug) {
                printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",