commit fa2b17e39499a77f41a719035a588b7fb63cec63
author hasso <hasso> Thu Mar 04 17:45:00 2004 +0000
committer hasso <hasso> Thu Mar 04 17:45:00 2004 +0000
tree 3356703917aaa8359e0106ae3c2340ee6eea0e1f
parent caa6f8ac7d07f8cd3269255e6dce6d248f74af62

Many warning fixes from PC Drew ([quagga-dev 940]) and removing using PAGER
from vtysh ([quagga-dev 932]).

ospfd/ospf_abr.c

diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index bacae91..424d1d3 100644
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -1078,7 +1078,7 @@
 
       if (IS_DEBUG_OSPF_EVENT)
 	zlog_info ("ospf_abr_process_network_rt(): announcing");
-      ospf_abr_announce_network (ospf, &rn->p, or);
+      ospf_abr_announce_network (ospf, (struct prefix_ipv4 *)&rn->p, or);
     }
 
   if (IS_DEBUG_OSPF_EVENT)
@@ -1474,7 +1474,7 @@
 				     " a transit area");
 			continue; 
 		      }
-		    ospf_abr_announce_network_to_area (&p, range->cost, ar);
+		    ospf_abr_announce_network_to_area ((struct prefix_ipv4 *)&p, range->cost, ar);
 		  }
 	      }
 	  }

ospfd/ospf_flood.c

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 05fcacd..22611d8 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -355,7 +355,6 @@
 			      struct ospf_neighbor *inbr,
 			      struct ospf_lsa *lsa)
 {
-  struct ospf *ospf = oi->ospf;
   struct ospf_neighbor *onbr;
   struct route_node *rn;
   int retx_flag;

ospfd/ospf_route.c

diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c
index c1c11f1..9889d6b 100644
--- a/ospfd/ospf_route.c
+++ b/ospfd/ospf_route.c
@@ -192,8 +192,8 @@
     {
       if (rn && rn->info)
         {
-          struct prefix_ipv4 *p = &rn->p;
-          if ( (ext_rn = route_node_lookup (external_routes, p)) )
+          struct prefix_ipv4 *p = (struct prefix_ipv4 *)(&rn->p);
+          if ( (ext_rn = route_node_lookup (external_routes, (struct prefix *)p)) )
             {
               ospf_zebra_delete (p, ext_rn->info);
               if (ext_rn->info)

ospfd/ospf_spf.c

diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index 8399e18..5ced71c 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -1132,7 +1132,7 @@
     delay = ospf->spf_delay;
 
   if (IS_DEBUG_OSPF_EVENT)
-    zlog_info ("SPF: calculation timer delay = %ld", delay);
+    zlog_info ("SPF: calculation timer delay = %ld", (long)delay);
   ospf->t_spf_calc =
     thread_add_timer (master, ospf_spf_calculate_timer, ospf, delay);
 }