Sync with changes in lib. Make more strings const.
diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 18b3c65..8327abf 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-11 Hasso Tepper <hasso at quagga.net>
+
+ * *.c: Make more strings const.
+
2004-10-08 Hasso Tepper <hasso at quagga.net>
* *.c: Fix compiler warnings: make strings const, signed -> unsigned
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index cbb4d3e..509d5ed 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -44,7 +44,7 @@
void rip_enable_apply (struct interface *);
void rip_passive_interface_apply (struct interface *);
int rip_if_down(struct interface *ifp);
-int rip_enable_if_lookup (char *ifname);
+int rip_enable_if_lookup (const char *ifname);
int rip_enable_network_lookup2 (struct connected *connected);
void rip_enable_apply_all ();
@@ -986,7 +986,7 @@
/* Check interface is enabled by ifname statement. */
int
-rip_enable_if_lookup (char *ifname)
+rip_enable_if_lookup (const char *ifname)
{
unsigned int i;
char *str;
@@ -1000,7 +1000,7 @@
/* Add interface to rip_enable_if. */
int
-rip_enable_if_add (char *ifname)
+rip_enable_if_add (const char *ifname)
{
int ret;
@@ -1017,7 +1017,7 @@
/* Delete interface from rip_enable_if. */
int
-rip_enable_if_delete (char *ifname)
+rip_enable_if_delete (const char *ifname)
{
int index;
char *str;
@@ -1268,7 +1268,7 @@
/* Utility function for looking up passive interface settings. */
int
-rip_passive_nondefault_lookup (char *ifname)
+rip_passive_nondefault_lookup (const char *ifname)
{
unsigned int i;
char *str;
@@ -1309,7 +1309,7 @@
/* Passive interface. */
int
-rip_passive_nondefault_set (struct vty *vty, char *ifname)
+rip_passive_nondefault_set (struct vty *vty, const char *ifname)
{
if (rip_passive_nondefault_lookup (ifname) >= 0)
return CMD_WARNING;
@@ -1322,7 +1322,7 @@
}
int
-rip_passive_nondefault_unset (struct vty *vty, char *ifname)
+rip_passive_nondefault_unset (struct vty *vty, const char *ifname)
{
int i;
char *str;
@@ -1984,7 +1984,7 @@
"Interface name\n"
"default for all interfaces\n")
{
- char *ifname = argv[0];
+ const char *ifname = argv[0];
if (!strcmp(ifname,"default")) {
passive_default = 1;
@@ -2005,7 +2005,7 @@
"Interface name\n"
"default for all interfaces\n")
{
- char *ifname = argv[0];
+ const char *ifname = argv[0];
if (!strcmp(ifname,"default")) {
passive_default = 0;
diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c
index 0d47348..6899c4d 100644
--- a/ripd/rip_offset.c
+++ b/ripd/rip_offset.c
@@ -47,7 +47,7 @@
static struct list *rip_offset_list_master;
int
-strcmp_safe (char *s1, char *s2)
+strcmp_safe (const char *s1, const char *s2)
{
if (s1 == NULL && s2 == NULL)
return 0;
@@ -75,7 +75,7 @@
}
struct rip_offset_list *
-rip_offset_list_lookup (char *ifname)
+rip_offset_list_lookup (const char *ifname)
{
struct rip_offset_list *offset;
struct listnode *nn;
@@ -89,7 +89,7 @@
}
struct rip_offset_list *
-rip_offset_list_get (char *ifname)
+rip_offset_list_get (const char *ifname)
{
struct rip_offset_list *offset;
@@ -106,8 +106,8 @@
}
int
-rip_offset_list_set (struct vty *vty, char *alist, char *direct_str,
- char *metric_str, char *ifname)
+rip_offset_list_set (struct vty *vty, const char *alist, const char *direct_str,
+ const char *metric_str, const char *ifname)
{
int direct;
int metric;
@@ -144,8 +144,9 @@
}
int
-rip_offset_list_unset (struct vty *vty, char *alist, char *direct_str,
- char *metric_str, char *ifname)
+rip_offset_list_unset (struct vty *vty, const char *alist,
+ const char *direct_str, const char *metric_str,
+ const char *ifname)
{
int direct;
int metric;
diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index ffe1317..e9dae2a 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -47,7 +47,7 @@
/* Add rip route map rule. */
int
rip_route_match_add (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -70,7 +70,7 @@
/* Delete rip route map rule. */
int
rip_route_match_delete (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -93,7 +93,7 @@
/* Add rip route map rule. */
int
rip_route_set_add (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -116,7 +116,7 @@
/* Delete rip route map rule. */
int
rip_route_set_delete (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -139,7 +139,7 @@
/* Hook function for updating route_map assignment. */
/* ARGSUSED */
void
-rip_route_map_update (char *notused)
+rip_route_map_update (const char *notused)
{
int i;
@@ -178,7 +178,7 @@
/* Route map `match metric' match statement. `arg' is METRIC value */
void *
-route_match_metric_compile (char *arg)
+route_match_metric_compile (const char *arg)
{
u_int32_t *metric;
@@ -239,7 +239,7 @@
/* Route map `match interface' match statement. `arg' is IFNAME value */
/* XXX I don`t know if I need to check does interface exist? */
void *
-route_match_interface_compile (char *arg)
+route_match_interface_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -291,7 +291,7 @@
/* Route map `ip next-hop' match statement. `arg' should be
access-list name. */
void *
-route_match_ip_next_hop_compile (char *arg)
+route_match_ip_next_hop_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -340,7 +340,7 @@
}
void *
-route_match_ip_next_hop_prefix_list_compile (char *arg)
+route_match_ip_next_hop_prefix_list_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -384,7 +384,7 @@
/* Route map `ip address' match statement. `arg' should be
access-list name. */
void *
-route_match_ip_address_compile (char *arg)
+route_match_ip_address_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -426,7 +426,7 @@
}
void *
-route_match_ip_address_prefix_list_compile (char *arg)
+route_match_ip_address_prefix_list_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -470,7 +470,7 @@
/* Route map `match tag' match statement. `arg' is TAG value */
void *
-route_match_tag_compile (char *arg)
+route_match_tag_compile (const char *arg)
{
u_short *tag;
@@ -530,10 +530,10 @@
/* set metric compilation. */
void *
-route_set_metric_compile (char *arg)
+route_set_metric_compile (const char *arg)
{
int len;
- char *pnt;
+ const char *pnt;
int type;
long metric;
char *endptr = NULL;
@@ -621,7 +621,7 @@
/* Route map `ip nexthop' compile function. Given string is converted
to struct in_addr structure. */
void *
-route_set_ip_nexthop_compile (char *arg)
+route_set_ip_nexthop_compile (const char *arg)
{
int ret;
struct in_addr *address;
@@ -681,7 +681,7 @@
/* Route map `tag' compile function. Given string is converted
to u_short. */
void *
-route_set_tag_compile (char *arg)
+route_set_tag_compile (const char *arg)
{
u_short *tag;
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 229fb33..d66a776 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -154,7 +154,7 @@
/* RIP route-map set for redistribution */
void
-rip_routemap_set (int type, char *name)
+rip_routemap_set (int type, const char *name)
{
if (rip->route_map[type].name)
free(rip->route_map[type].name);
@@ -184,7 +184,7 @@
/* RIP route-map unset for redistribution */
int
-rip_routemap_unset (int type,char *name)
+rip_routemap_unset (int type, const char *name)
{
if (! rip->route_map[type].name ||
(name != NULL && strcmp(rip->route_map[type].name,name)))
diff --git a/ripd/ripd.c b/ripd/ripd.c
index a799886..2b4e1b2 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3107,8 +3107,8 @@
}
int
-rip_distance_set (struct vty *vty, char *distance_str, char *ip_str,
- char *access_list_str)
+rip_distance_set (struct vty *vty, const char *distance_str, const char *ip_str,
+ const char *access_list_str)
{
int ret;
struct prefix_ipv4 p;
@@ -3154,8 +3154,8 @@
}
int
-rip_distance_unset (struct vty *vty, char *distance_str, char *ip_str,
- char *access_list_str)
+rip_distance_unset (struct vty *vty, const char *distance_str,
+ const char *ip_str, const char *access_list_str)
{
int ret;
struct prefix_ipv4 p;
@@ -3948,7 +3948,7 @@
/* ARGSUSED */
void
-rip_routemap_update (char *notused)
+rip_routemap_update (const char *notused)
{
struct interface *ifp;
struct listnode *node;
diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 8fb577b..1375b25 100644
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-11 Hasso Tepper <hasso at quagga.net>
+
+ * *.c: Make more strings const.
+
2004-10-08 Hasso Tepper <hasso at quagga.net>
* *.[c|h]: Fix compiler warnings: make strings const, signed ->
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index eb9005c..f5467f9 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -52,7 +52,7 @@
/* Static utility function. */
static void ripng_enable_apply (struct interface *);
static void ripng_passive_interface_apply (struct interface *);
-int ripng_enable_if_lookup (char *ifname);
+int ripng_enable_if_lookup (const char *ifname);
int ripng_enable_network_lookup2 (struct connected *connected);
void ripng_enable_apply_all ();
@@ -155,12 +155,12 @@
}
/* Check max mtu size. */
-int
+unsigned int
ripng_check_max_mtu ()
{
struct listnode *node;
struct interface *ifp;
- int mtu;
+ unsigned int mtu;
mtu = 0;
for (node = listhead (iflist); node; nextnode (node))
@@ -636,7 +636,7 @@
/* Lookup function. */
int
-ripng_enable_if_lookup (char *ifname)
+ripng_enable_if_lookup (const char *ifname)
{
unsigned int i;
char *str;
@@ -650,7 +650,7 @@
/* Add interface to ripng_enable_if. */
int
-ripng_enable_if_add (char *ifname)
+ripng_enable_if_add (const char *ifname)
{
int ret;
@@ -667,7 +667,7 @@
/* Delete interface from ripng_enable_if. */
int
-ripng_enable_if_delete (char *ifname)
+ripng_enable_if_delete (const char *ifname)
{
int index;
char *str;
@@ -860,7 +860,7 @@
/* Utility function for looking up passive interface settings. */
int
-ripng_passive_interface_lookup (char *ifname)
+ripng_passive_interface_lookup (const char *ifname)
{
unsigned int i;
char *str;
@@ -902,7 +902,7 @@
/* Passive interface. */
int
-ripng_passive_interface_set (struct vty *vty, char *ifname)
+ripng_passive_interface_set (struct vty *vty, const char *ifname)
{
if (ripng_passive_interface_lookup (ifname) >= 0)
return CMD_WARNING;
@@ -915,7 +915,7 @@
}
int
-ripng_passive_interface_unset (struct vty *vty, char *ifname)
+ripng_passive_interface_unset (struct vty *vty, const char *ifname)
{
int i;
char *str;
@@ -954,7 +954,7 @@
ripng_network_write (struct vty *vty, int config_mode)
{
unsigned int i;
- char *ifname;
+ const char *ifname;
struct route_node *node;
char buf[BUFSIZ];
diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c
index ab3c460..46e23f0 100644
--- a/ripngd/ripng_offset.c
+++ b/ripngd/ripng_offset.c
@@ -51,7 +51,7 @@
static struct list *ripng_offset_list_master;
int
-strcmp_safe (char *s1, char *s2)
+strcmp_safe (const char *s1, const char *s2)
{
if (s1 == NULL && s2 == NULL)
return 0;
@@ -78,7 +78,7 @@
}
struct ripng_offset_list *
-ripng_offset_list_lookup (char *ifname)
+ripng_offset_list_lookup (const char *ifname)
{
struct ripng_offset_list *offset;
struct listnode *nn;
@@ -92,7 +92,7 @@
}
struct ripng_offset_list *
-ripng_offset_list_get (char *ifname)
+ripng_offset_list_get (const char *ifname)
{
struct ripng_offset_list *offset;
@@ -109,8 +109,9 @@
}
int
-ripng_offset_list_set (struct vty *vty, char *alist, char *direct_str,
- char *metric_str, char *ifname)
+ripng_offset_list_set (struct vty *vty, const char *alist,
+ const char *direct_str, const char *metric_str,
+ const char *ifname)
{
int direct;
int metric;
@@ -147,8 +148,9 @@
}
int
-ripng_offset_list_unset (struct vty *vty, char *alist, char *direct_str,
- char *metric_str, char *ifname)
+ripng_offset_list_unset (struct vty *vty, const char *alist,
+ const char *direct_str, const char *metric_str,
+ const char *ifname)
{
int direct;
int metric;
diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index a318301..1c17e6c 100644
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -45,7 +45,7 @@
int
ripng_route_match_add (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -69,7 +69,7 @@
int
ripng_route_match_delete (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -93,7 +93,7 @@
int
ripng_route_set_add (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -117,7 +117,7 @@
int
ripng_route_set_delete (struct vty *vty, struct route_map_index *index,
- const char *command, char *arg)
+ const char *command, const char *arg)
{
int ret;
@@ -163,7 +163,7 @@
/* Route map `match metric' match statement. `arg' is METRIC value */
void *
-route_match_metric_compile (char *arg)
+route_match_metric_compile (const char *arg)
{
u_int32_t *metric;
@@ -223,7 +223,7 @@
/* Route map `match interface' match statement. `arg' is IFNAME value */
void *
-route_match_interface_compile (char *arg)
+route_match_interface_compile (const char *arg)
{
return XSTRDUP (MTYPE_ROUTE_MAP_COMPILED, arg);
}
@@ -267,7 +267,7 @@
/* Route map `match tag' match statement. `arg' is TAG value */
void *
-route_match_tag_compile (char *arg)
+route_match_tag_compile (const char *arg)
{
u_short *tag;
@@ -327,10 +327,10 @@
/* set metric compilation. */
void *
-route_set_metric_compile (char *arg)
+route_set_metric_compile (const char *arg)
{
int len;
- char *pnt;
+ const char *pnt;
int type;
long metric;
char *endptr = NULL;
@@ -419,7 +419,7 @@
/* Route map `ipv6 nexthop local' compile function. Given string is converted
to struct in6_addr structure. */
void *
-route_set_ipv6_nexthop_local_compile (char *arg)
+route_set_ipv6_nexthop_local_compile (const char *arg)
{
int ret;
struct in6_addr *address;
@@ -479,7 +479,7 @@
/* Route map `tag' compile function. Given string is converted
to u_short. */
void *
-route_set_tag_compile (char *arg)
+route_set_tag_compile (const char *arg)
{
u_short *tag;
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index 7aaa353..6e58259 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -184,7 +184,7 @@
}
void
-ripng_redistribute_routemap_set (int type, char *name)
+ripng_redistribute_routemap_set (int type, const char *name)
{
if (ripng->route_map[type].name)
free (ripng->route_map[type].name);
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index a7254bc..edf959f 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2992,7 +2992,7 @@
}
void
-ripng_routemap_update (char *unused)
+ripng_routemap_update (const char *unused)
{
struct interface *ifp;
struct listnode *node;