Merge tag 'upstream/1.2.3'

[quagga-debian.git] / ripd / ripd.c

diff --git a/ripd/ripd.c b/ripd/ripd.c
index c073ecab6a99b3e9a4ea0cfe30b4e8d7ed59235b..8f7e077f39af1d2ca2cc59dc34820fb439fd2593 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2538,14 +2538,14 @@ rip_update_process (int route_type)
        ifp = if_lookup_address (p->prefix);
        if (! ifp)
          {
-           zlog_warn ("Neighbor %s doesnt have connected interface!",
+           zlog_warn ("Neighbor %s doesn't have connected interface!",
                       inet_ntoa (p->prefix));
            continue;
          }
         
         if ( (connected = connected_lookup_address (ifp, p->prefix)) == NULL)
           {
-            zlog_warn ("Neighbor %s doesnt have connected network",
+            zlog_warn ("Neighbor %s doesn't have connected network",
                        inet_ntoa (p->prefix));
             continue;
           }
@@ -3872,7 +3872,7 @@ rip_distribute_update_all (struct prefix_list *notused)
 }
 /* ARGSUSED */
 static void
-rip_distribute_update_all_wrapper(struct access_list *notused)
+rip_distribute_update_all_wrapper(const char *unused)
 {
         rip_distribute_update_all(NULL);
 }