4 files changed, 13 insertions, 12 deletions
diff --git a/lib/log.c b/lib/log.c
index f7a36851..8c3e2ddc 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -771,7 +771,7 @@ lookup (const struct message *mes, int key)
  * provided otherwise.
  */
 const char *
-mes_lookup (struct message *meslist, int max, int index, const char *none)
+mes_lookup (const struct message *meslist, int max, int index, const char *none)
 {
   int pos = index - meslist[0].key;
   
diff --git a/lib/log.h b/lib/log.h
index 86097919..2dd1d313 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -151,7 +151,7 @@ extern int zlog_rotate (struct zlog *);
 #define LOOKUP(x, y) mes_lookup(x, x ## _max, y, "(no item found)")
 
 extern const char *lookup (const struct message *, int);
-extern const char *mes_lookup (struct message *meslist, 
+extern const char *mes_lookup (const struct message *meslist, 
                                int max, int index,
                                const char *no_item);
 
diff --git a/lib/smux.c b/lib/smux.c
index 54cd3e7f..d5378897 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -83,7 +83,7 @@ static struct cmd_node smux_node =
 static struct thread_master *master;
 
 void *
-oid_copy (void *dest, void *src, size_t size)
+oid_copy (void *dest, const void *src, size_t size)
 {
   return memcpy (dest, src, size * sizeof (oid));
 }
@@ -157,7 +157,7 @@ oid_compare_part (oid *o1, int o1_len, oid *o2, int o2_len)
 }
 
 static void
-smux_oid_dump (const char *prefix, oid *oid, size_t oid_len)
+smux_oid_dump (const char *prefix, const oid *oid, size_t oid_len)
 {
   unsigned int i;
   int first = 1;
@@ -174,7 +174,7 @@ smux_oid_dump (const char *prefix, oid *oid, size_t oid_len)
 }
 
 static int
-smux_socket ()
+smux_socket (void)
 {
   int ret;
 #ifdef HAVE_IPV6
@@ -995,9 +995,9 @@ smux_open (int sock)
 }
 
 int
-smux_trap (oid *name, size_t namelen,
-	   oid *iname, size_t inamelen,
-	   struct trap_object *trapobj, size_t trapobjlen,
+smux_trap (const oid *name, size_t namelen,
+	   const oid *iname, size_t inamelen,
+	   const struct trap_object *trapobj, size_t trapobjlen,
 	   unsigned int tick, u_char sptrap)
 {
   unsigned int i;
@@ -1234,7 +1234,7 @@ smux_connect (struct thread *t)
 
 /* Clear all SMUX related resources. */
 static void
-smux_stop ()
+smux_stop (void)
 {
   if (smux_read_thread)
     {
@@ -1395,7 +1395,7 @@ smux_header_generic (struct variable *v, oid *name, size_t *length, int exact,
 }
 
 static int
-smux_peer_default ()
+smux_peer_default (void)
 {
   if (smux_oid)
     {
diff --git a/lib/smux.h b/lib/smux.h
index 87a76648..a32a3958 100644
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -150,11 +150,12 @@ extern void smux_register_mib(const char *, struct variable *,
                               size_t, int, oid [], size_t);
 extern int smux_header_generic (struct variable *, oid [], size_t *, 
                                 int, size_t *, WriteMethod **);
-extern int smux_trap (oid *, size_t, oid *, size_t, struct trap_object *, 
+extern int smux_trap (const oid *, size_t, const oid *, size_t, 
+		      const struct trap_object *, 
                       size_t, unsigned int, u_char);
 extern int oid_compare (oid *, int, oid *, int);
 extern void oid2in_addr (oid [], int, struct in_addr *);
-extern void *oid_copy (void *, void *, size_t);
+extern void *oid_copy (void *, const void *, size_t);
 extern void oid_copy_addr (oid [], struct in_addr *, int);
 
 #endif /* _ZEBRA_SNMP_H */