Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_apiserver.c

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index d4a8a266cbe0e99238043657dd69c6b8cb9aa604..49730063b996ec1ddbf2734cd5cc152b404db247 100644 (file)
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -154,7 +154,7 @@ int ospf_apiserver_init(void)
                ospf_apiserver_lsa_update, ospf_apiserver_lsa_delete);
        if (rc != 0) {
                flog_warn(
-                       OSPF_WARN_OPAQUE_REGISTRATION,
+                       EC_OSPF_OPAQUE_REGISTRATION,
                        "ospf_apiserver_init: Failed to register opaque type [0/0]");
        }
 
@@ -182,7 +182,7 @@ void ospf_apiserver_term(void)
 
        /* Free client list itself */
        if (apiserver_list)
-               list_delete_and_null(&apiserver_list);
+               list_delete(&apiserver_list);
 
        /* Free wildcard list */
        /* XXX  */
@@ -869,7 +869,7 @@ int ospf_apiserver_register_opaque_type(struct ospf_apiserver *apiserv,
                NULL /* ospf_apiserver_lsa_delete */);
 
        if (rc != 0) {
-               flog_warn(OSPF_WARN_OPAQUE_REGISTRATION,
+               flog_warn(EC_OSPF_OPAQUE_REGISTRATION,
                          "Failed to register opaque type [%d/%d]", lsa_type,
                          opaque_type);
                return OSPF_API_OPAQUETYPEINUSE;
@@ -1665,7 +1665,7 @@ int ospf_apiserver_originate1(struct ospf_lsa *lsa)
 
        /* Install this LSA into LSDB. */
        if (ospf_lsa_install(ospf, lsa->oi, lsa) == NULL) {
-               flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+               flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
                          "ospf_apiserver_originate1: ospf_lsa_install failed");
                return -1;
        }
@@ -1778,7 +1778,7 @@ struct ospf_lsa *ospf_apiserver_lsa_refresher(struct ospf_lsa *lsa)
        /* Install LSA into LSDB. */
        if (ospf_lsa_install(ospf, new->oi, new) == NULL) {
                flog_warn(
-                       OSPF_WARN_LSA_INSTALL_FAILURE,
+                       EC_OSPF_LSA_INSTALL_FAILURE,
                        "ospf_apiserver_lsa_refresher: ospf_lsa_install failed");
                ospf_lsa_unlock(&new);
                goto out;
@@ -2024,7 +2024,7 @@ int ospf_apiserver_del_if(struct interface *ifp)
 
        /* zlog_warn for debugging */
        zlog_warn("ospf_apiserver_del_if");
-       zlog_warn("ifp name=%s status=%d index=%d\n", ifp->name, ifp->status,
+       zlog_warn("ifp name=%s status=%d index=%d", ifp->name, ifp->status,
                  ifp->ifindex);
 
        oi = ospf_apiserver_if_lookup_by_ifp(ifp);
@@ -2110,7 +2110,6 @@ void ospf_apiserver_show_info(struct vty *vty, struct ospf_lsa *lsa)
                for (i = 0; i < opaquelen; i++) {
                        zlog_debug("0x%x ", olsa->data[i]);
                }
-               zlog_debug("\n");
        }
        return;
 }
@@ -2326,14 +2325,12 @@ void ospf_apiserver_clients_notify_ism_change(struct ospf_interface *oi)
 void ospf_apiserver_clients_notify_nsm_change(struct ospf_neighbor *nbr)
 {
        struct msg *msg;
-       struct in_addr ifaddr = {.s_addr = 0L};
+       struct in_addr ifaddr;
        struct in_addr nbraddr;
 
        assert(nbr);
 
-       if (nbr->oi) {
-               ifaddr = nbr->oi->address->u.prefix4;
-       }
+       ifaddr = nbr->oi->address->u.prefix4;
 
        nbraddr = nbr->address.u.prefix4;