zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospfd / ospf_lsa.c

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 4d46e9739bc353d9ba0bd6a6974e2f48cd5b31d4..288ce43f79dae78b413d2be0c27d6ec6b8cddcce 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -398,7 +398,7 @@ struct ospf_neighbor *ospf_nbr_lookup_ptop(struct ospf_interface *oi)
 
        /* PtoP link must have only 1 neighbor. */
        if (ospf_nbr_count(oi, 0) > 1)
-               flog_warn(OSPF_WARN_PTP_NEIGHBOR,
+               flog_warn(EC_OSPF_PTP_NEIGHBOR,
                          "Point-to-Point link has more than 1 neighobrs.");
 
        return nbr;
@@ -448,7 +448,7 @@ static char link_info_set(struct stream **s, struct in_addr id,
 
                if (ret == OSPF_MAX_LSA_SIZE) {
                        flog_warn(
-                               OSPF_WARN_LSA_SIZE,
+                               EC_OSPF_LSA_SIZE,
                                "%s: Out of space in LSA stream, left %zd, size %zd",
                                __func__, STREAM_WRITEABLE(*s),
                                STREAM_SIZE(*s));
@@ -1819,7 +1819,7 @@ struct ospf_lsa *ospf_translated_nssa_originate(struct ospf *ospf,
        }
 
        if ((new = ospf_lsa_install(ospf, NULL, new)) == NULL) {
-               flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+               flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
                          "ospf_lsa_translated_nssa_originate(): "
                          "Could not install LSA "
                          "id %s",
@@ -1891,7 +1891,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
                        zlog_debug(
                                "ospf_translated_nssa_refresh(): no Type-7 found for "
                                "Type-5 LSA Id %s",
-                               type5 ? inet_ntoa(type5->data->id) : "(null)");
+                               inet_ntoa(type5->data->id));
                return NULL;
        }
 
@@ -1901,7 +1901,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
                        zlog_debug(
                                "ospf_translated_nssa_refresh(): No translated Type-5 "
                                "found for Type-7 with Id %s",
-                               type7 ? inet_ntoa(type7->data->id) : "(null)");
+                               inet_ntoa(type7->data->id));
                return NULL;
        }
 
@@ -1914,13 +1914,13 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
                        zlog_debug(
                                "ospf_translated_nssa_refresh(): Could not translate "
                                "Type-7 for %s to Type-5",
-                               type7 ? inet_ntoa(type7->data->id) : "(null)");
+                               inet_ntoa(type7->data->id));
                return NULL;
        }
 
        if (!(new = ospf_lsa_install(ospf, NULL, new))) {
                flog_warn(
-                       OSPF_WARN_LSA_INSTALL_FAILURE,
+                       EC_OSPF_LSA_INSTALL_FAILURE,
                        "ospf_translated_nssa_refresh(): Could not install translated LSA, Id %s",
                        inet_ntoa(type7->data->id));
                return NULL;
@@ -2061,7 +2061,7 @@ int ospf_external_lsa_originate_timer(struct thread *thread)
 
                        if (!ospf_external_lsa_originate(ospf, ei))
                                flog_warn(
-                                       OSPF_WARN_LSA_INSTALL_FAILURE,
+                                       EC_OSPF_LSA_INSTALL_FAILURE,
                                        "LSA: AS-external-LSA was not originated.");
                }
        }
@@ -3633,7 +3633,7 @@ void ospf_refresher_unregister_lsa(struct ospf *ospf, struct ospf_lsa *lsa)
                        ospf->lsa_refresh_queue.qs[lsa->refresh_list];
                listnode_delete(refresh_list, lsa);
                if (!listcount(refresh_list)) {
-                       list_delete_and_null(&refresh_list);
+                       list_delete(&refresh_list);
                        ospf->lsa_refresh_queue.qs[lsa->refresh_list] = NULL;
                }
                ospf_lsa_unlock(&lsa); /* lsa_refresh_queue */
@@ -3702,7 +3702,7 @@ int ospf_lsa_refresh_walker(struct thread *t)
                                lsa->refresh_list = -1;
                                listnode_add(lsa_to_refresh, lsa);
                        }
-                       list_delete_and_null(&refresh_list);
+                       list_delete(&refresh_list);
                }
        }
 
@@ -3718,7 +3718,7 @@ int ospf_lsa_refresh_walker(struct thread *t)
                        &lsa); /* lsa_refresh_queue & temp for lsa_to_refresh*/
        }
 
-       list_delete_and_null(&lsa_to_refresh);
+       list_delete(&lsa_to_refresh);
 
        if (IS_DEBUG_OSPF(lsa, LSA_REFRESH))
                zlog_debug("LSA[Refresh]: ospf_lsa_refresh_walker(): end");