Merge pull request #8643 from icosahedral/master

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index 709d2176aa01529a6efa2e16df360178d5428639..4bd160ddbca6e741b0c3ff8e40a457c254d02fa8 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -30,13 +30,11 @@
 
 extern struct zebra_privs_t zserv_privs;
 
-char proc_net_snmp[] = "/proc/net/snmp";
+static const char proc_net_snmp[] = "/proc/net/snmp";
 
 static void dropline(FILE *fp)
 {
-       int c;
-
-       while ((c = getc(fp)) != '\n')
+       while (getc(fp) != '\n')
                ;
 }
 
@@ -70,7 +68,7 @@ int ipforward(void)
 }
 
 /* char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/conf/all/forwarding"; */
-char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
+static const char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
 
 int ipforward_on(void)
 {
@@ -114,7 +112,8 @@ int ipforward_off(void)
        return ipforward();
 }
 
-char proc_ipv6_forwarding[] = "/proc/sys/net/ipv6/conf/all/forwarding";
+static const char proc_ipv6_forwarding[] =
+       "/proc/sys/net/ipv6/conf/all/forwarding";
 
 int ipforward_ipv6(void)
 {