Some minor fixes.

diff --git a/lib/ipv4.c b/lib/ipv4.c
index 8488a2860b2b50f3c3f6afc921962a7107cbe459..751351ca1ac5bcc68e004d46d6155b7edb3a113f 100644 (file)
--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -60,7 +60,7 @@ ipv4_class_mask(u32 a)
 
        if (a < 0x80000000)
                m = 0xff000000;
-       if (a < 0xc0000000)
+       else if (a < 0xc0000000)
                m = 0xffff0000;
        else
                m = 0xffffff00;

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 06121ea38144803a39ea6b7a7c7b1d05c8362064..6976ddcd3153a81c00294815828b13db6f180bae 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1781,14 +1781,14 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
     d->net_counter++;
   for(e=n->routes; e; e=e->next)
     {
-      struct ea_list *tmpa, *old_tmpa;
+      struct ea_list *tmpa;
       struct proto *p0 = e->attrs->proto;
       struct proto *p1 = d->export_protocol;
       struct proto *p2 = d->show_protocol;
       d->rt_counter++;
       ee = e;
       rte_update_lock();               /* We use the update buffer for filtering */
-      old_tmpa = tmpa = p0->make_tmp_attrs ? p0->make_tmp_attrs(e, rte_update_pool) : NULL;
+      tmpa = p0->make_tmp_attrs ? p0->make_tmp_attrs(e, rte_update_pool) : NULL;
       ok = (d->filter == FILTER_ACCEPT || f_run(d->filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) <= F_ACCEPT);
       if (p2 && p2 != p0) ok = 0;
       if (ok && d->export_mode)

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 9872faf28b788da0eda3fae1726513036fbdb524..ef7b0363d4cec368d247afb4029b2595631f4054 100644 (file)
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -1145,16 +1145,16 @@ show_lsa_sum_net(struct top_hash_entry *he)
 static inline void
 show_lsa_sum_rt(struct top_hash_entry *he)
 {
-  u32 dst_rid, options;
+  u32 dst_rid;
 
 #ifdef OSPFv2
   struct ospf_lsa_sum *ls = he->lsa_body;
   dst_rid = he->lsa.id;
-  options = 0;
+  // options = 0;
 #else /* OSPFv3 */
   struct ospf_lsa_sum_rt *ls = he->lsa_body;
   dst_rid = ls->drid; 
-  options = ls->options & OPTIONS_MASK;
+  // options = ls->options & OPTIONS_MASK;
 #endif
 
   cli_msg(-1016, "\t\txrouter %R metric %u", dst_rid, ls->metric);

diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 604c8ea7b7e661406db97a7620e017c0c2d12539..7e9bad501d276ba0ffc2608ca243f43892f88f44 100644 (file)
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -798,7 +798,7 @@ originate_sum_net_lsa(struct ospf_area *oa, struct fib_node *fn, int metric)
 
   body = originate_sum_net_lsa_body(po, &lsa.length, fn, metric);
   lsasum_calculate(&lsa, body);
-  en = lsa_install_new(po, &lsa, dom, body);
+  lsa_install_new(po, &lsa, dom, body);
   ospf_lsupd_flood(po, NULL, NULL, &lsa, dom, 1);
 }
 
@@ -835,7 +835,7 @@ originate_sum_rt_lsa(struct ospf_area *oa, struct fib_node *fn, int metric, u32
 
   body = originate_sum_rt_lsa_body(po, &lsa.length, lsa.id, metric, options);
   lsasum_calculate(&lsa, body);
-  en = lsa_install_new(po, &lsa, dom, body);
+  lsa_install_new(po, &lsa, dom, body);
   ospf_lsupd_flood(po, NULL, NULL, &lsa, dom, 1);
 }
 
@@ -1117,7 +1117,7 @@ originate_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src,
   if (src) 
     fn->x1 = src;
 
-  en = lsa_install_new(po, &lsa, dom, body);
+  lsa_install_new(po, &lsa, dom, body);
   ospf_lsupd_flood(po, NULL, NULL, &lsa, dom, 1);
 
   if (po->ebit == 0)