ospfd: Fix compile warnings

These compile issues were found w/ gcc and running
./buildtest.sh on a fedora 25 box.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index 4c31bad0a86595ba75647e21217a4436f51cb21c..a54170e04800497b8ef846e9dbbd8c1397fedc47 100644 (file)
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -701,7 +701,7 @@ ospf_abr_translate_nssa (struct ospf_area *area, struct ospf_lsa *lsa)
                zlog_debug ("ospf_abr_translate_nssa(): Could not translate "
                           "Type-7 for %s to Type-5", 
                           inet_ntoa (lsa->data->id));
-               return 1;
+              return 1;
            }
     }
 
@@ -948,11 +948,11 @@ ospf_abr_announce_network (struct ospf *ospf,
             zlog_debug ("ospf_abr_announce_network(): "
                        "this is intra-area route to %s/%d",
                        inet_ntoa (p->prefix), p->prefixlen);
-            if ((range = ospf_area_range_match (or_area, p)) 
-                 && !ospf_area_is_transit (area))
-              ospf_abr_update_aggregate (range, or, area);
-            else
-              ospf_abr_announce_network_to_area (p, or->cost, area);
+          if ((range = ospf_area_range_match (or_area, p)) 
+              && !ospf_area_is_transit (area))
+            ospf_abr_update_aggregate (range, or, area);
+          else
+            ospf_abr_announce_network_to_area (p, or->cost, area);
         }
     }
 }

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 1a7691c5293c9cbe29aafb85dd48b07500495264..b83093db3c982377ed9ccd981c2ea79e4c65d407 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -113,8 +113,8 @@ ospf_router_id_update (struct ospf *ospf)
   else
     router_id = router_id_zebra;
 
-  
-    if (!IPV4_ADDR_SAME (&router_id_old, &router_id))
+
+  if (!IPV4_ADDR_SAME (&router_id_old, &router_id))
     {
 
       for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))