rstp compiling under gcc 4.3.3 fixes
PATCH 1/1 rstp compiling under gcc 4.3.3 fixes
Sorry, properly formatted
rstp git tree:
After fetching current git code and compiling with gcc 4.3.3 got errors related to Werror (2 functions was ignoring return value), and ulimits.h was not declared, but INT_MAX used
Here is fix, so rstp compile fine with gcc 4.3.3.
Signed-off-by Denys Fedoryschenko <[email protected]>
---
bridge_track.c +6 -1
@@ -386,6 +386,7 @@static int stp_enabled (struct ifdata *br) {char path[40 +IFNAMSIZ ]; +int ret;sprintf (path,"/sys/class/net/%s/bridge/stp_state" , br->name);FILE *f =fopen (path,"r" );if (!f) {
@@ -393,7 +394,11 @@return 0 ; }int enabled =0 ; -fscanf (f,"%d" , &enabled); + ret =fscanf (f,"%d" , &enabled); +if (!ret) { +LOG ("%s, stp_state parsing error" , path); +return 0 ; + }fclose (f);INFO ("STP on %s state %d" , br->name, enabled);
ctl_main.c +1 -0
@@ -16,6 +16,7 @@#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <limits.h> #include "ctl_socket_client.h" #include "ctl_functions.h"
main.c +6 -2
@@ -42,7 +42,7 @@int main (int argc,char *argv[]) { -int c; +int c,ret;while ((c =getopt (argc, argv,"dv:" )) !=-1 ) {switch (c) {case 'd' :
@@ -78,7 +78,11 @@return -1 ; }openlog ("rstpd" ,0 ,LOG_DAEMON ); -daemon (0 ,0 ); + ret =daemon (0 ,0 ); +if (ret) { +ERROR ("daemon() failed" ); +return -1 ; + } is_daemon =1 ;fprintf (f,"%d" ,getpid ());fclose (f);
netif_utils.c +1 -0
@@ -32,6 +32,7 @@#include <sys/socket.h> #include <sys/ioctl.h> #include <fcntl.h> +#include <limits.h> #include <net/if.h> #include <linux/if_ether.h>