*: fix warning fallout from set_socket_path

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

12 files changed, 14 insertions, 12 deletions

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index e6f5cdcb67..ba59365a6e 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -40,6 +40,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "queue.h"
 #include "vrf.h"
 #include "bfd.h"
+#include "sockopt.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_attr.h"
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 865f5c5f94..1b9fa68051 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -38,6 +38,7 @@
 #include "plist.h"
 #include "zclient.h"
 #include "vrf.h"
+#include "sockopt.h"
 #include "qobj.h"
 
 #include "isisd/dict.h"
@@ -246,7 +247,6 @@ main (int argc, char **argv, char **envp)
   struct thread thread;
   char *config_file = NULL;
   char *vty_addr = NULL;
-  char *vty_sock_name;
   int dryrun = 0;
 
   /* Get the programname without the preceding path. */
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 40726ba0bb..927af682a1 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -39,6 +39,7 @@
 #include "sigevent.h"
 #include "zclient.h"
 #include "vrf.h"
+#include "sockopt.h"
 #include "qobj.h"
 
 static void		 ldpd_shutdown(void);
@@ -224,7 +225,6 @@ main(int argc, char *argv[])
 	char			*p;
 	char			*vty_addr = NULL;
 	int			 vty_port = LDP_VTY_PORT;
-	char			*vty_sock_name;
 	char			*ctl_sock_custom_path = NULL;
 	char			*ctl_sock_name;
 	int			 daemon_mode = 0;
diff --git a/lib/sockopt.c b/lib/sockopt.c
index 570b575a7a..e661b4cc56 100644
--- a/lib/sockopt.c
+++ b/lib/sockopt.c
@@ -31,9 +31,9 @@
 
 /* Replace the path of given defaultpath with newpath, but keep filename */
 void
-set_socket_path (char *path, char *defaultpath, char *newpath, int maxsize)
+set_socket_path (char *path, const char *defaultpath, char *newpath, int maxsize)
 {
-  char *sock_name;
+  const char *sock_name;
 
   sock_name = strrchr(defaultpath, '/');
   if (sock_name)
diff --git a/lib/sockopt.h b/lib/sockopt.h
index 8e7895dd6f..7e1bd62446 100644
--- a/lib/sockopt.h
+++ b/lib/sockopt.h
@@ -25,7 +25,8 @@
 #include "sockunion.h"
 
 /* Override (vty) socket paths, but keep the filename */
-extern void set_socket_path (char *path, char *defaultpath, char *newpath, int maxsize);
+extern void set_socket_path (char *path, const char *defaultpath,
+                             char *newpath, int maxsize);
 
 extern void setsockopt_so_recvbuf (int sock, int size);
 extern void setsockopt_so_sendbuf (const int sock, int size);
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 68d2b6894d..f85580fa59 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -39,6 +39,7 @@
 #include "zclient.h"
 #include "vrf.h"
 #include "bfd.h"
+#include "sockopt.h"
 
 #include "ospf6d.h"
 #include "ospf6_top.h"
@@ -239,7 +240,6 @@ main (int argc, char *argv[], char *envp[])
   int opt;
   char *vty_addr = NULL;
   int vty_port = 0;
-  char *vty_sock_name;
   char *config_file = NULL;
   struct thread thread;
   int dryrun = 0;
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 6719eb2497..845d96032b 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -41,6 +41,7 @@
 #include "sigevent.h"
 #include "zclient.h"
 #include "vrf.h"
+#include "sockopt.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
@@ -194,7 +195,6 @@ main (int argc, char **argv)
   char *vty_addr = NULL;
   int vty_port = OSPF_VTY_PORT;
   char vty_path[100];
-  char *vty_sock_name;
   int daemon_mode = 0;
   char *config_file = NULL;
   char *progname;
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 1a3c8165e4..e4aa2de594 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -38,6 +38,7 @@
 #include "prefix.h"
 #include "plist.h"
 #include "vrf.h"
+#include "sockopt.h"
 
 #include "pimd.h"
 #include "pim_version.h"
@@ -133,7 +134,6 @@ Report bugs to %s\n", progname, PIMD_BUG_ADDRESS);
 int main(int argc, char** argv, char** envp) {
   char *p;
   char *vty_addr = NULL;
-  char *vty_sock_name;
   int vty_port = -1;
   int daemon_mode = 0;
   char *config_file = NULL;
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index e46f867952..58dd2df6fa 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -35,6 +35,7 @@
 #include "sigevent.h"
 #include "zclient.h"
 #include "vrf.h"
+#include "sockopt.h"
 
 #include "ripd/ripd.h"
 
@@ -201,7 +202,6 @@ main (int argc, char **argv)
   int dryrun = 0;
   char *progname;
   struct thread thread;
-  char *vty_sock_name;
 
   /* Set umask before anything for security */
   umask (0027);
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 1677996eaa..a90dffce14 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -36,6 +36,7 @@
 #include "privs.h"
 #include "sigevent.h"
 #include "vrf.h"
+#include "sockopt.h"
 
 #include "ripngd/ripngd.h"
 
@@ -201,7 +202,6 @@ main (int argc, char **argv)
   char *progname;
   struct thread thread;
   int dryrun = 0;
-  char *vty_sock_name;
 
   /* Set umask before anything for security */
   umask (0027);
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index bad21ae661..78b17be058 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -272,7 +272,7 @@ main (int argc, char **argv, char **env)
   int boot_flag = 0;
   const char *daemon_name = NULL;
   const char *inputfile = NULL;
-  char *vtysh_configfile_name;
+  const char *vtysh_configfile_name;
   struct cmd_rec {
     const char *line;
     struct cmd_rec *next;
diff --git a/zebra/main.c b/zebra/main.c
index aa1cbc3b26..a68e8adeb6 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -35,6 +35,7 @@
 #include "privs.h"
 #include "sigevent.h"
 #include "vrf.h"
+#include "sockopt.h"
 
 #include "zebra/rib.h"
 #include "zebra/zserv.h"
@@ -265,7 +266,6 @@ main (int argc, char **argv)
   char *p;
   char *vty_addr = NULL;
   int vty_port = ZEBRA_VTY_PORT;
-  char *vty_sock_name;
   int dryrun = 0;
   int batch_mode = 0;
   int daemon_mode = 0;