pppd: Eliminate some warnings

auth.c: In function ‘start_link’:
auth.c:556:11: warning: variable ‘msg’ set but not used [-Wunused-but-set-variable]
utils.c: In function ‘logit’:
utils.c:655:9: warning: variable ‘n’ set but not used [-Wunused-but-set-variable]
sys-linux.c: In function ‘ether_to_eui64’:
sys-linux.c:2881:9: warning: pointer targets in assignment differ in signedness [-Wpointer-sign]

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/pppd/auth.c b/pppd/auth.c
index 883b7f5bb8aedfec061daa37b7bb2e4eabf15de8..7b269b805b2b7eb06ec9792c7e24c222a6c4b3c8 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -553,13 +553,10 @@ link_required(unit)
 void start_link(unit)
     int unit;
 {
 void start_link(unit)
     int unit;
 {

-    char *msg;
-

     new_phase(PHASE_SERIALCONN);
 
     hungup = 0;
     devfd = the_channel->connect();
     new_phase(PHASE_SERIALCONN);
 
     hungup = 0;
     devfd = the_channel->connect();

-    msg = "Connect script failed";

     if (devfd < 0)
        goto fail;
 
     if (devfd < 0)
        goto fail;
 


@@ -572,7 +569,6 @@ void start_link(unit)
      * gives us.  Thus we don't need the tdb_writelock/tdb_writeunlock.
      */
     fd_ppp = the_channel->establish_ppp(devfd);
      * gives us.  Thus we don't need the tdb_writelock/tdb_writeunlock.
      */
     fd_ppp = the_channel->establish_ppp(devfd);

-    msg = "ppp establishment failed";

     if (fd_ppp < 0) {
        status = EXIT_FATAL_ERROR;
        goto disconnect;
     if (fd_ppp < 0) {
        status = EXIT_FATAL_ERROR;
        goto disconnect;

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 4fe221d86549ba9efeb204db375e093eebfceba0..2540c4fba29e38ce72120c4d316f369916e421c6 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -2878,7 +2878,7 @@ ether_to_eui64(eui64_t *p_eui64)
     /*
      * And convert the EUI-48 into EUI-64, per RFC 2472 [sec 4.1]
      */
     /*
      * And convert the EUI-48 into EUI-64, per RFC 2472 [sec 4.1]
      */

-    ptr = ifr.ifr_hwaddr.sa_data;
+    ptr = (unsigned char *) ifr.ifr_hwaddr.sa_data;

     p_eui64->e8[0] = ptr[0] | 0x02;
     p_eui64->e8[1] = ptr[1];
     p_eui64->e8[2] = ptr[2];
     p_eui64->e8[0] = ptr[0] | 0x02;
     p_eui64->e8[1] = ptr[1];
     p_eui64->e8[2] = ptr[2];

diff --git a/pppd/utils.c b/pppd/utils.c
index 5c9ba6437757d6d4a679c2e0f642f65020ef8368..eb771a540c118cad770548a64b9cadfa61f85211 100644 (file)
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -652,10 +652,9 @@ logit(level, fmt, args)
     char *fmt;
     va_list args;
 {
     char *fmt;
     va_list args;
 {

-    int n;

     char buf[1024];
 
     char buf[1024];
 

-    n = vslprintf(buf, sizeof(buf), fmt, args);
+    vslprintf(buf, sizeof(buf), fmt, args);

     log_write(level, buf);
 }
 
     log_write(level, buf);
 }