Changeset 18817

Timestamp:

03/23/12 16:02:07 (14 months ago)

Author:

BrainSlayer

Message:

fix some warnings

Location:

src/router/pppd.new/pppd

Files:

• Makefile.linux (modified) (1 diff)
• plugins/pptp/Makefile (modified) (1 diff)
• plugins/radius/Makefile.linux (modified) (1 diff)
• plugins/radius/avpair.c (modified) (5 diffs)
• plugins/radius/radius.c (modified) (1 diff)
• plugins/radius/sendserver.c (modified) (5 diffs)
• plugins/rp-pppoe/Makefile.linux (modified) (1 diff)
• pppd.h (modified) (1 diff)

src/router/pppd.new/pppd/Makefile.linux

@@ -95 +95 @@
 endif
 
-CFLAGS+= $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+CFLAGS+= -ffunction-sections -fdata-sections -Wl,--gc-sections -Wall $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
 
 

src/router/pppd.new/pppd/plugins/pptp/Makefile

@@ -13 +13 @@
 
 PLUGIN=pptp
-COPTS = -O2
-CFLAGS=-I. -I../../../ $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -DNEED_PRINTF
+CFLAGS=-Wall -ffunction-sections -fdata-sections -Wl,--gc-sections -I. -I../../../ $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -DNEED_PRINTF
 
 

src/router/pppd.new/pppd/plugins/radius/Makefile.linux

@@ -14 +14 @@
 PLUGIN=radius.so radattr.so radrealms.so
 #COPTS = -O2
-CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON 
+CFLAGS=-Wall -ffunction-sections -fdata-sections -Wl,--gc-sections  -I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON 
 
 

src/router/pppd.new/pppd/plugins/radius/avpair.c

@@ -77 +77 @@
                                 vp->lvalue = len;
                         } else {
-                        strncpy (vp->strvalue, (char *) pval, AUTH_STRING_LEN);
+                        strncpy ((char*)vp->strvalue, (char *) pval, AUTH_STRING_LEN);
                         vp->lvalue = strlen((char *) pval);
                         }
@@ -197 +197 @@
                                 x_len--, x_ptr++)
                         {
-                                sprintf (hex, "%2.2X", *x_ptr);
-                                strcat (buffer, hex);
+                                sprintf ((char*)hex, "%2.2X", *x_ptr);
+                                strcat (buffer, (char*)hex);
                         }
                         warn("rc_avpair_gen: received unknown attribute %d of length %d: 0x%s",
@@ -598 +598 @@
 
                             case PW_TYPE_STRING:
-                                strcpy (pair->strvalue, valstr);
+                                strcpy ((char*)pair->strvalue, valstr);
                                 pair->lvalue = strlen(valstr);
                                 break;
@@ -722 +722 @@
                         else
                         {
-                                strncat(value, ptr, 1);
+                                strncat(value, (char*)ptr, 1);
                                 lv--;
                                 if (lv < 0) break;
@@ -738 +738 @@
                 else
                 {
-                        sprintf (buffer, "%ld", pair->lvalue);
+                        sprintf (buffer, "%d", pair->lvalue);
                         strncpy(value, buffer, (size_t) lv);
                 }

src/router/pppd.new/pppd/plugins/radius/radius.c

@@ -634 +634 @@
             switch (vp->attribute) {
             case PW_MS_CHAP2_SUCCESS:
-                if ((vp->lvalue != 43) || strncmp(vp->strvalue + 1, "S=", 2)) {
+                if ((vp->lvalue != 43) || strncmp((char*)vp->strvalue + 1, "S=", 2)) {
                     slprintf(msg,BUF_LEN,"RADIUS: bad MS-CHAP2-Success packet");
                     return -1;
                 }
                 if (message != NULL)
-                    strlcpy(message, vp->strvalue + 1, message_space);
+                    strlcpy(message, (char*)vp->strvalue + 1, message_space);
                 ms_chap2_success = 1;
                 break;

src/router/pppd.new/pppd/plugins/radius/sendserver.c

@@ -105 +105 @@
 
                     secretlen = strlen (secret);
-                    vector = (char *)auth->vector;
+                    vector = (unsigned char *)auth->vector;
                     for(i = 0; i < padded_length; i += AUTH_VECTOR_LEN) {
                         /* Calculate the MD5 digest*/
@@ -201 +201 @@
         UINT4           auth_ipaddr;
         char           *server_name;    /* Name of server to query */
-        int             salen;
+        unsigned int             salen;
         int             result;
         int             total_length;
-        int             length;
+        unsigned int             length;
         int             retry_max;
         int             secretlen;
@@ -273 +273 @@
                 secretlen = strlen (secret);
                 memcpy ((char *) auth + total_length, secret, secretlen);
-                rc_md5_calc (vector, (char *) auth, total_length + secretlen);
+                rc_md5_calc (vector, (unsigned char *) auth, total_length + secretlen);
                 memcpy ((char *) auth->vector, (char *) vector, AUTH_VECTOR_LEN);
         }
@@ -363 +363 @@
                 if ((vp = rc_avpair_get(vp, PW_REPLY_MESSAGE)))
                 {
-                        strcat(msg, vp->strvalue);
+                        strcat(msg, (char*)vp->strvalue);
                         strcat(msg, "\n");
                         vp = vp->next;
@@ -429 +429 @@
         memcpy ((char *) auth->vector, (char *) vector, AUTH_VECTOR_LEN);
         memcpy ((char *) auth + totallen, secret, secretlen);
-        rc_md5_calc (calc_digest, (char *) auth, totallen + secretlen);
+        rc_md5_calc (calc_digest, (unsigned char *) auth, totallen + secretlen);
 
 #ifdef DIGEST_DEBUG

src/router/pppd.new/pppd/plugins/rp-pppoe/Makefile.linux

@@ -26 +26 @@
 
 #COPTS=-O2 -g
-CFLAGS=$(COPTS) -I../../../include/linux 
+CFLAGS= -Wall -ffunction-sections -fdata-sections -Wl,--gc-sections $(COPTS) -I../../../include/linux 
 #CFLAGS=$(COPTS) -I$(LINUXDIR)/include/linux
 

src/router/pppd.new/pppd/pppd.h

@@ -525 +525 @@
 
 #ifndef NEED_PRINTF
-#define option_error(fmt,args...) { }
-
-
-#define notice(fmt,...) { }
-#define info(fmt,...) { }
-#define dbglog(fmt,...) { }
-#define warn(fmt,...) { }
+#define option_error(fmt,args...) do { } while(0)
+
+
+#define notice(fmt,...)do { } while(0)
+#define info(fmt,...) do { } while(0)
+#define dbglog(fmt,...) do { } while(0)
+#define warn(fmt,...) do { } while(0)
 #define error(fmt,...) { ++error_count; }
 #define fatal(fmt,...) { die(1); }