Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index 709d2176aa01529a6efa2e16df360178d5428639..08fbfede42aff314518df36463ec7a7b44883c81 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Fetch ipforward value by reading /proc filesystem.
  * Copyright (C) 1997 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -30,13 +15,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 +53,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 +97,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)
 {