ppp-2.3.3 + some -Wall

1 files changed, 7 insertions, 19 deletions

diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index 86387bd8add..aa7702c159d 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipxcp.c,v 1.3 1997/09/05 04:32:39 millert Exp $	*/
+/*	$OpenBSD: ipxcp.c,v 1.4 1998/01/17 20:30:22 millert Exp $	*/
 
 /*
  * ipxcp.c - PPP IPX Control Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: ipxcp.c,v 1.5 1997/03/04 03:39:32 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.3 1997/09/05 04:32:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.4 1998/01/17 20:30:22 millert Exp $";
 #endif
 #endif
 
@@ -42,6 +42,7 @@ static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.3 1997/09/05 04:32:39 millert Exp $
 #include "pppd.h"
 #include "fsm.h"
 #include "ipxcp.h"
+#include "magic.h"
 #include "pathnames.h"
 
 /* global vars */
@@ -169,7 +170,7 @@ ipx_ntoa(ipxaddr)
 u_int32_t ipxaddr;
 {
     static char b[64];
-    sprintf(b, "%lx", ipxaddr);
+    sprintf(b, "%x", ipxaddr);
     return b;
 }
 
@@ -342,8 +343,6 @@ static void
 ipxcp_resetci(f)
     fsm *f;
 {
-    u_int32_t network;
-    int unit = f->unit;
 
     wo->req_node = wo->neg_node && ao->neg_node;
     wo->req_nn	 = wo->neg_nn	&& ao->neg_nn;
@@ -393,7 +392,6 @@ static int
 ipxcp_cilen(f)
     fsm *f;
 {
-    int unit = f->unit;
     int len;
 
     len	 = go->neg_nn	    ? CILEN_NETN     : 0;
@@ -417,8 +415,6 @@ ipxcp_addci(f, ucp, lenp)
     u_char *ucp;
     int *lenp;
 {
-    int len = *lenp;
-    int unit = f->unit;
 /*
  * Add the options to the record.
  */
@@ -468,7 +464,6 @@ ipxcp_ackci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_short cilen, citype, cishort;
     u_char cichar;
     u_int32_t cilong;
@@ -577,7 +572,6 @@ ipxcp_nakci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_char citype, cilen, *next;
     u_short s;
     u_int32_t l;
@@ -696,7 +690,6 @@ ipxcp_rejci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_short cilen, citype, cishort;
     u_char cichar;
     u_int32_t cilong;
@@ -813,17 +806,15 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
     int *len;			/* Length of requested CIs */
     int reject_if_disagree;
 {
-    int unit = f->unit;
     u_char *cip, *next;		/* Pointer to current and next CIs */
     u_short cilen, citype;	/* Parsed len, type */
-    u_short cishort, ts;	/* Parsed short value */
-    u_int32_t tl, cinetwork, outnet;/* Parsed address values */
+    u_short cishort;		/* Parsed short value */
+    u_int32_t tl, cinetwork;	/* Parsed address values */
     int rc = CONFACK;		/* Final packet return code */
     int orc;			/* Individual option return code */
     u_char *p;			/* Pointer to next char to parse */
     u_char *ucp = inp;		/* Pointer to current output char */
     int l = *len;		/* Length left */
-    u_char maxslotindex, cflag;
 
     /*
      * Reset all his options.
@@ -865,7 +856,7 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
 		break;		
 	    }
 	    GETLONG(cinetwork, p);
-	    IPXCPDEBUG((LOG_INFO,"Remote proposed IPX network number is %8Lx",tl));
+	    IPXCPDEBUG((LOG_INFO,"Remote proposed IPX network number is %8x",tl));
 
 	    /* If the network numbers match then acknowledge them. */
 	    if (cinetwork != 0) {
@@ -1100,7 +1091,6 @@ endswitch:
 
     if (rc != CONFREJ && !ho->neg_node &&
 	wo->req_nn && !reject_if_disagree) {
-	u_char *ps;
 	if (rc == CONFACK) {
 	    rc = CONFNAK;
 	    wo->req_nn = 0;		/* don't ask again */
@@ -1203,7 +1193,6 @@ static void
 ipxcp_down(f)
     fsm *f;
 {
-    u_int32_t ournn, network;
 
     IPXCPDEBUG((LOG_INFO, "ipxcp: down"));
 
@@ -1222,7 +1211,6 @@ ipxcp_script(f, script)
     fsm *f;
     char *script;
 {
-    int	 unit = f->unit;
     char strspeed[32],	 strlocal[32],	   strremote[32];
     char strnetwork[32], strpid[32];
     char *argv[14],	 strproto_lcl[32], strproto_rmt[32];