summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2004-10-11 12:53:17 +0000
committerhasso <hasso>2004-10-11 12:53:17 +0000
commita149411b85bbe74cde47d82193026b9401b29de0 (patch)
tree87e720d2fad17c0af227e3eda4db321718a7bacb
parent8552e37427c8c6f3b3f5e02e55e2a34b28604af6 (diff)
Some more const string fixes.
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/command.h4
-rw-r--r--lib/sockunion.c2
-rw-r--r--lib/sockunion.h2
4 files changed, 9 insertions, 4 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index d258ab30..9a01f636 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11 Hasso Tepper <hasso at quagga.net>
+
+ * command.h: Sync DEFUNSH with other macros.
+ * sockunion.c, sockunion.h: More const strings.
+
2004-10-11 Paul Jakma <paul@dishone.st>
* thread.c: (funcname_thread_add_timer)
diff --git a/lib/command.h b/lib/command.h
index 0f806c87..a8387346 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -192,7 +192,7 @@ struct desc
/* DEFUN + DEFSH */
#define DEFUNSH(daemon, 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, \
@@ -201,7 +201,7 @@ struct desc
daemon \
}; \
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[])
/* ALIAS macro which define existing command's alias. */
#define ALIAS(funcname, cmdname, cmdstr, helpstr) \
diff --git a/lib/sockunion.c b/lib/sockunion.c
index 587b324a..eb29ced2 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -133,7 +133,7 @@ inet_sutop (union sockunion *su, char *str)
}
int
-str2sockunion (char *str, union sockunion *su)
+str2sockunion (const char *str, union sockunion *su)
{
int ret;
diff --git a/lib/sockunion.h b/lib/sockunion.h
index 99bdf6a3..92e536c1 100644
--- a/lib/sockunion.h
+++ b/lib/sockunion.h
@@ -87,7 +87,7 @@ enum connect_result
#define sockunion_family(X) (X)->sa.sa_family
/* Prototypes. */
-int str2sockunion (char *, union sockunion *);
+int str2sockunion (const char *, union sockunion *);
const char *sockunion2str (union sockunion *, char *, size_t);
int sockunion_cmp (union sockunion *, union sockunion *);
int sockunion_same (union sockunion *, union sockunion *);