From 9035efaa924c69f4f4fcb1049c7dc4f43b9da980 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 10 Oct 2004 11:56:56 +0000 Subject: 2004-10-10 Paul Jakma * version.h.in: (pid_output*) add const qualifier. * command.h: Change DEFUN func to take const char *[] rather than char **, to begin process of fixing compile warnings in lib/. Nearly all other changes in this commit follow from this change. * buffer.{c,h}: (buffer_write) pointer-arithmetic is gccism, take const void * and cast an automatic const char *p to it. (buffer_putstr) add const * command.c: (zencrypt) const qualifier (cmd_execute_command_real) ditto (cmd_execute_command_strict) ditto (config_log_file) ditto. Fix leak of getcwd() returned string. * memory.{c,h}: Add MTYPE_DISTRIBUTE_IFNAME for struct dist ifname. * distribute.{c,h}: Update with const qualifier. (distribute_free) use MTYPE_DISTRIBUTE_IFNAME (distribute_lookup) Cast to char *, note that it's ok. (distribute_hash_alloc) use MTYPE_DISTRIBUTE_IFNAME. (distribute_get) Cast to char *, note that it's ok. * filter.c: Update with const qualifier. * if.{c,h}: ditto. * if_rmap.{c,h}: ditto. (if_rmap_lookup) Cast to char *, note that it's ok. (if_rmap_get) ditto. * log.{c,h}: Update with const qualifier. * plist.{c,h}: ditto. * routemap.{c,h}: ditto. * smux.{c,h}: ditto. Fix some signed/unsigned comparisons. * sockopt.c: (getsockopt_cmsg_data) add return for error case. * vty.c: Update with const qualifier. --- lib/routemap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'lib/routemap.c') diff --git a/lib/routemap.c b/lib/routemap.c index 748aa2cf..cd231be7 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -57,9 +57,9 @@ struct route_map_list struct route_map *head; struct route_map *tail; - void (*add_hook) (char *); - void (*delete_hook) (char *); - void (*event_hook) (route_map_event_t, char *); + void (*add_hook) (const char *); + void (*delete_hook) (const char *); + void (*event_hook) (route_map_event_t, const char *); }; /* Master list of route map. */ @@ -75,7 +75,7 @@ route_map_index_delete (struct route_map_index *, int); /* New route map allocation. Please note route map's name must be specified. */ static struct route_map * -route_map_new (char *name) +route_map_new (const char *name) { struct route_map *new; @@ -86,7 +86,7 @@ route_map_new (char *name) /* Add new name to route_map. */ static struct route_map * -route_map_add (char *name) +route_map_add (const char *name) { struct route_map *map; struct route_map_list *list; @@ -147,7 +147,7 @@ route_map_delete (struct route_map *map) /* Lookup route map by route map name string. */ struct route_map * -route_map_lookup_by_name (char *name) +route_map_lookup_by_name (const char *name) { struct route_map *map; @@ -160,7 +160,7 @@ route_map_lookup_by_name (char *name) /* Lookup route map. If there isn't route map create one and return it. */ struct route_map * -route_map_get (char *name) +route_map_get (const char *name) { struct route_map *map; @@ -241,7 +241,7 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map) } int -vty_show_route_map (struct vty *vty, char *name) +vty_show_route_map (struct vty *vty, const char *name) { struct route_map *map; @@ -852,19 +852,19 @@ route_map_apply (struct route_map *map, struct prefix *prefix, } void -route_map_add_hook (void (*func) (char *)) +route_map_add_hook (void (*func) (const char *)) { route_map_master.add_hook = func; } void -route_map_delete_hook (void (*func) (char *)) +route_map_delete_hook (void (*func) (const char *)) { route_map_master.delete_hook = func; } void -route_map_event_hook (void (*func) (route_map_event_t, char *)) +route_map_event_hook (void (*func) (route_map_event_t, const char *)) { route_map_master.event_hook = func; } -- cgit v1.2.3