fixes for 4.3.3 GCC warnings/errors

[people/ms/rstp.git] / bridge_track.c

diff --git a/bridge_track.c b/bridge_track.c
index e93c014f5e7c1b6cb5dcaf4bc500bcb234e3b6fe..c68593530bfed6853b2e792946fe7c2563fe90b7 100644 (file)
--- a/bridge_track.c
+++ b/bridge_track.c
@@ -230,6 +230,7 @@ static int check_mac_address(char *name, unsigned char *addr)
 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) {
@@ -237,7 +238,11 @@ static int stp_enabled(struct ifdata *br)
                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);