diff options
author | paul <paul> | 2004-10-10 11:56:56 +0000 |
---|---|---|
committer | paul <paul> | 2004-10-10 11:56:56 +0000 |
commit | 9035efaa924c69f4f4fcb1049c7dc4f43b9da980 (patch) | |
tree | f81d25b0e069ad8fb5f2843172a4e60fa0d6cbdf /lib/command.h | |
parent | ddd119fd3d94e95dd44aa9fb3bc3fca4f26078a0 (diff) |
2004-10-10 Paul Jakma <paul@dishone.st>
* 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.
Diffstat (limited to 'lib/command.h')
-rw-r--r-- | lib/command.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/command.h b/lib/command.h index 9e727cfb..0f806c87 100644 --- a/lib/command.h +++ b/lib/command.h @@ -129,7 +129,7 @@ struct cmd_node struct cmd_element { const char *string; /* Command specification by string. */ - int (*func) (struct cmd_element *, struct vty *, int, char **); + int (*func) (struct cmd_element *, struct vty *, int, const char *[]); const char *doc; /* Documentation of this command. */ int daemon; /* Daemon to which this command belong. */ vector strvec; /* Pointing out each description vector. */ @@ -166,15 +166,15 @@ struct desc /* DEFUN for vty command interafce. Little bit hacky ;-). */ #define DEFUN(funcname, cmdname, cmdstr, helpstr) \ - int funcname (struct cmd_element *, struct vty *, int, char **); \ + int funcname (struct cmd_element *, struct vty *, int, const char *[]); \ struct cmd_element cmdname = \ { \ - cmdstr, \ - funcname, \ - helpstr \ + .string = cmdstr, \ + .func = funcname, \ + .doc = helpstr \ }; \ int funcname \ - (struct cmd_element *self, struct vty *vty, int argc, char **argv) + (struct cmd_element *self, struct vty *vty, int argc, const char *argv[]) /* DEFUN_NOSH for commands that vtysh should ignore */ #define DEFUN_NOSH(funcname, cmdname, cmdstr, helpstr) \ @@ -304,8 +304,8 @@ extern struct cmd_element config_exit_cmd; extern struct cmd_element config_quit_cmd; extern struct cmd_element config_help_cmd; extern struct cmd_element config_list_cmd; -int config_exit (struct cmd_element *, struct vty *, int, char **); -int config_help (struct cmd_element *, struct vty *, int, char **); +int config_exit (struct cmd_element *, struct vty *, int, const char *[]); +int config_help (struct cmd_element *, struct vty *, int, const char *[]); char *host_config_file (); void host_config_set (char *); |