From: Paul Mackerras <paulus@samba.org>
Date: Tue, 24 May 1994 11:22:28 +0000 (+0000)
Subject: fixed some minor compilation warnings
X-Git-Tag: ppp-2-1-2a~42
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=e5e66630876a7fa7b8bcca319dac26466e39ed51;ds=inline

fixed some minor compilation warnings
---

diff --git a/pppd/fsm.c b/pppd/fsm.c
index e07e38d..902ad64 100644
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.2 1994/04/18 04:01:50 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.3 1994/05/24 11:21:10 paulus Exp $";
 #endif
 
 /*
@@ -407,6 +407,8 @@ fsm_rconfreq(f, id, inp, len)
 	code = (*f->callbacks->reqci)(f, inp, &len, reject_if_disagree);
     } else if (len)
 	code = CONFREJ;			/* Reject all CI */
+    else
+	code = CONFACK;
 
     /* send the Ack, Nak or Rej to the peer */
     fsm_sdata(f, code, id, inp, len);
@@ -716,11 +718,11 @@ fsm_sconfreq(f, retransmit)
     /*
      * Make up the request packet
      */
+    outp = outpacket_buf + DLLHEADERLEN + HEADERLEN;
     if( f->callbacks->cilen && f->callbacks->addci ){
 	cilen = (*f->callbacks->cilen)(f);
 	if( cilen > peer_mru[f->unit] - HEADERLEN )
 	    cilen = peer_mru[f->unit] - HEADERLEN;
-	outp = outpacket_buf + DLLHEADERLEN + HEADERLEN;
 	if (f->callbacks->addci)
 	    (*f->callbacks->addci)(f, outp, &cilen);
     } else
diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 4914405..7d71463 100644
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.6 1994/05/24 05:57:56 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.7 1994/05/24 11:21:52 paulus Exp $";
 #endif
 
 /*
@@ -493,10 +493,6 @@ ipcp_nakci(f, p, len)
 	len -= cilen; \
 	INCPTR(2, p); \
 	GETSHORT(cishort, p); \
-	if (cilen == CILEN_VJ) { \
-	    GETCHAR(cimaxslotindex, p); \
-            GETCHAR(cicflag, p); \
-        } \
 	no.neg = 1; \
         code \
     }
@@ -526,6 +522,8 @@ ipcp_nakci(f, p, len)
      */
     NAKCIVJ(CI_COMPRESSTYPE, neg_vj,
 	    if (cilen == CILEN_VJ) {
+		GETCHAR(cimaxslotindex, p);
+		GETCHAR(cicflag, p);
 		if (cishort == IPCP_VJ_COMP) {
 		    try.old_vj = 0;
 		    if (cimaxslotindex < go->maxslotindex)
diff --git a/pppd/lcp.h b/pppd/lcp.h
index 68f4762..0499a7c 100644
--- a/pppd/lcp.h
+++ b/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.h,v 1.3 1994/04/18 04:00:16 paulus Exp $
+ * $Id: lcp.h,v 1.4 1994/05/24 11:22:28 paulus Exp $
  */
 
 /*
@@ -54,7 +54,7 @@ typedef struct lcp_options {
     int neg_accompression : 1;	/* HDLC Address/Control Field Compression? */
     int neg_lqr : 1;		/* Negotiate use of Link Quality Reports */
     u_short mru;		/* Value of MRU */
-    char chap_mdtype;		/* which MD type (hashing algorithm) */
+    u_char chap_mdtype;		/* which MD type (hashing algorithm) */
     u_long asyncmap;		/* Value of async map */
     u_long magicnumber;
     int numloops;		/* Number of loops during magic number neg. */