snmp: fix warnings

batch-fix all warnings that come up when enabling AgentX SNMP support.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit dfee58f1d41a2e36c7f5f38a3ef5712224131824)

diff --git a/lib/smux.h b/lib/smux.h
index 72b4eaf09934d01cd1f7f4d533623fa85f2cf410..45e84eead2c5a0c642391fed8bf3ed3b2ee65991 100644 (file)
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -53,8 +53,8 @@ struct trap_object
 
 /* Declare SMUX return value. */
 #define SNMP_LOCAL_VARIABLES \
-  static long snmp_int_val; \
-  static struct in_addr snmp_in_addr_val;
+  static long snmp_int_val __attribute__ ((unused)); \
+  static struct in_addr snmp_in_addr_val __attribute__ ((unused));
 
 #define SNMP_INTEGER(V) \
   ( \
@@ -106,7 +106,7 @@ extern int smux_trap (struct variable *, size_t,
                      const struct trap_object *, size_t,
                      u_char);
 
-extern int oid_compare (oid *, int, oid *, int);
+extern int oid_compare (const oid *, int, const oid *, int);
 extern void oid2in_addr (oid [], int, struct in_addr *);
 extern void *oid_copy (void *, const void *, size_t);
 extern void oid_copy_addr (oid [], struct in_addr *, int);

diff --git a/lib/snmp.c b/lib/snmp.c
index 79595a1ea2175d81d082559f0db1868f29300a39..f6f9845e2d7df6fb0a6e3988beb5cdc672c6bb91 100644 (file)
--- a/lib/snmp.c
+++ b/lib/snmp.c
@@ -30,7 +30,7 @@
 #define min(A,B) ((A) < (B) ? (A) : (B))
 
 int
-oid_compare (oid *o1, int o1_len, oid *o2, int o2_len)
+oid_compare (const oid *o1, int o1_len, const oid *o2, int o2_len)
 {
   int i;
 

diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 4be8be04b1a88942f499345a24bf6787f2b5b6ae..42432d7133ec704dfee0c21aa07d8c8f4ecb53f8 100644 (file)
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -626,7 +626,6 @@ ospfv3WwLsdbEntry (struct variable *v, oid *name, size_t *length,
   int len;
   oid *offset;
   int offsetlen;
-  char a[16], b[16], c[16];
   struct ospf6_area *oa;
   struct listnode *node;
   struct interface *iif;

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 7f7b157860b89ea95231ea6bcf4719738427e518..9f91776944d7f2ccb7e86aeb097e47452d596316 100644 (file)
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -986,7 +986,7 @@ ospfLsdbLookup (struct variable *v, oid *name, size_t *length,
       offsetlen = *length - v->namelen;
       len = offsetlen;
 
-      if (len > IN_ADDR_SIZE)
+      if (len > (int)IN_ADDR_SIZE)
        len = IN_ADDR_SIZE;
 
       oid2in_addr (offset, len, area_id);
@@ -1026,7 +1026,7 @@ ospfLsdbLookup (struct variable *v, oid *name, size_t *length,
          else
            {
              ls_id_next = 0;
-             if (len > IN_ADDR_SIZE)
+             if (len > (int)IN_ADDR_SIZE)
                len = IN_ADDR_SIZE;
 
              oid2in_addr (offset, len, ls_id);
@@ -1042,7 +1042,7 @@ ospfLsdbLookup (struct variable *v, oid *name, size_t *length,
          else
            {
              router_id_next = 0;
-             if (len > IN_ADDR_SIZE)
+             if (len > (int)IN_ADDR_SIZE)
                len = IN_ADDR_SIZE;
 
              oid2in_addr (offset, len, router_id);
@@ -1152,7 +1152,7 @@ ospfAreaRangeLookup (struct variable *v, oid *name, size_t *length,
 {
   oid *offset;
   int offsetlen;
-  unsigned int len;
+  int len;
   struct ospf *ospf;
   struct ospf_area *area;
   struct ospf_area_range *range;
@@ -1193,7 +1193,7 @@ ospfAreaRangeLookup (struct variable *v, oid *name, size_t *length,
       offsetlen = *length - v->namelen;
 
       len = offsetlen;
-      if (len > IN_ADDR_SIZE)
+      if (len > (int)IN_ADDR_SIZE)
        len = IN_ADDR_SIZE;
 
       oid2in_addr (offset, len, area_id);
@@ -1215,7 +1215,7 @@ ospfAreaRangeLookup (struct variable *v, oid *name, size_t *length,
 
          if (len < 0)
            len = 0;
-         if (len > IN_ADDR_SIZE)
+         if (len > (int)IN_ADDR_SIZE)
            len = IN_ADDR_SIZE;
 
          oid2in_addr (offset, len, range_net);

diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index 9d4e60dbb1922f0a319ae3dd08b90b8b0995b596..4b7d1b4c5020e465d8eedd9def9626614016d3ad 100644 (file)
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -295,7 +295,7 @@ rip2PeerLookup (struct variable *v, oid name[], size_t *length,
 
       peer = rip_peer_lookup (addr);
 
-      if (peer->domain == name[v->namelen + sizeof (struct in_addr)])
+      if (peer->domain == (int)name[v->namelen + sizeof (struct in_addr)])
        return peer;
 
       return NULL;
@@ -311,8 +311,8 @@ rip2PeerLookup (struct variable *v, oid name[], size_t *length,
       peer = rip_peer_lookup (addr);
       if (peer)
        {
-         if ((len < sizeof (struct in_addr) + 1) ||
-             (peer->domain > name[v->namelen + sizeof (struct in_addr)]))
+         if ((len < (int)sizeof (struct in_addr) + 1) ||
+             (peer->domain > (int)name[v->namelen + sizeof (struct in_addr)]))
            {
              oid_copy_addr (name + v->namelen, &peer->addr,
                             sizeof (struct in_addr));