From 0c083ee9d870bf02a36563ae1807f3894ac24219 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 10 Oct 2004 12:54:58 +0000 Subject: 2004-10-10 Paul Jakma * ospf6_route.c: Add const qualifier to various char arrays of constants. signed/unsigned fixes. (ospf6_linkstate_table_show) argv is const * ospf6_snmp.c: listnode typedef is dead. (ospf6_snmp_init) Take struct thread_master arg, needed for smux_init. * ospf6_snmp.h: update ospf6_snmp_init declaration. * ospf6d.c: (ospf6_init) add const qualifier to sargv, pass master to ospf_snmp6_init. * ospf6_asbr.c: const char update. * ospf6_interface.c: ditto, plus signed/unsigned fixes. (ipv6_ospf6_cost) Check whether cost fits in u_int32_t and use strtoul. * ospf6_intra.c: const char update. Parenthesise expression. * ospf6_lsa.c: signed/unsigned and const char updates. * ospf6_proto.c: ditto. * ospf6_message.c: ditto. * ospf6_lsdb.c: signed/unsigned update. * ospf6_main.c: const char update. * ospf6_neighbor.c: ditto. * ospf6_spf.c: ditto. * ospf6_top.c: ditto. --- ospf6d/ospf6_route.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ospf6d/ospf6_route.c') diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 7a5a3941..c1c6d359 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -63,16 +63,16 @@ ospf6_linkstate_prefix2str (struct prefix *prefix, char *buf, int size) } /* Global strings for logging */ -char *ospf6_dest_type_str[OSPF6_DEST_TYPE_MAX] = +const char *ospf6_dest_type_str[OSPF6_DEST_TYPE_MAX] = { "Unknown", "Router", "Network", "Discard", "Linkstate", "AddressRange", }; -char *ospf6_dest_type_substr[OSPF6_DEST_TYPE_MAX] = +const char *ospf6_dest_type_substr[OSPF6_DEST_TYPE_MAX] = { "?", "R", "N", "D", "L", "A", }; -char *ospf6_path_type_str[OSPF6_PATH_TYPE_MAX] = +const char *ospf6_path_type_str[OSPF6_PATH_TYPE_MAX] = { "Unknown", "Intra-Area", "Inter-Area", "External-1", "External-2", }; -char *ospf6_path_type_substr[OSPF6_PATH_TYPE_MAX] = +const char *ospf6_path_type_substr[OSPF6_PATH_TYPE_MAX] = { "??", "IA", "IE", "E1", "E2", }; @@ -206,7 +206,7 @@ _route_count_assert (struct ospf6_route_table *table) { struct ospf6_route *debug; char buf[64]; - int num = 0; + unsigned int num = 0; for (debug = ospf6_route_head (table); debug; debug = ospf6_route_next (debug)) num++; @@ -769,7 +769,7 @@ ospf6_route_show_table_summary (struct vty *vty, { struct ospf6_route *route, *prev = NULL; int i, pathtype[OSPF6_PATH_TYPE_MAX]; - int number = 0; + unsigned int number = 0; int nhinval = 0, ecmp = 0; int alternative = 0, destination = 0; @@ -908,7 +908,7 @@ ospf6_route_show_table (struct vty *vty, int detail, } int -ospf6_route_table_show (struct vty *vty, int argc, char **argv, +ospf6_route_table_show (struct vty *vty, int argc, const char *argv[], struct ospf6_route_table *table) { int summary = 0; @@ -1083,7 +1083,7 @@ ospf6_linkstate_show_table (struct vty *vty, int detail, } int -ospf6_linkstate_table_show (struct vty *vty, int argc, char **argv, +ospf6_linkstate_table_show (struct vty *vty, int argc, const char *argv[], struct ospf6_route_table *table) { int detail = 0; -- cgit v1.2.1