eigrpd: eigrp usage of uint32_t to struct in_addr for router_id data

[mirror_frr.git] / ospf6d / ospf6_interface.c

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 9178bf2f6a5776ee5e1b6db4c31d2bb9294dd278..2bfa4201cbce5bed54f907745c25223ba198f630 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -180,12 +180,6 @@ struct ospf6_interface *ospf6_interface_create(struct interface *ifp)
        oi = (struct ospf6_interface *)XCALLOC(MTYPE_OSPF6_IF,
                                               sizeof(struct ospf6_interface));
 
-       if (!oi) {
-               zlog_err("Can't malloc ospf6_interface for ifindex %d",
-                        ifp->ifindex);
-               return (struct ospf6_interface *)NULL;
-       }
-
        oi->area = (struct ospf6_area *)NULL;
        oi->neighbor_list = list_new();
        oi->neighbor_list->cmp = ospf6_neighbor_cmp;
@@ -247,7 +241,7 @@ void ospf6_interface_delete(struct ospf6_interface *oi)
        for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
                ospf6_neighbor_delete(on);
 
-       list_delete_and_null(&oi->neighbor_list);
+       list_delete(&oi->neighbor_list);
 
        THREAD_OFF(oi->thread_send_hello);
        THREAD_OFF(oi->thread_send_lsupdate);
@@ -1079,13 +1073,18 @@ DEFUN (show_ipv6_ospf6_interface_traffic,
 
 DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
        show_ipv6_ospf6_interface_ifname_prefix_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix [<X:X::X:X|X:X::X:X/M>] [<match|detail>]",
+       "show ipv6 ospf6 interface IFNAME prefix\
+          [<\
+           detail\
+           |<X:X::X:X|X:X::X:X/M> [<match|detail>]\
+         >]",
        SHOW_STR
        IP6_STR
        OSPF6_STR
        INTERFACE_STR
        IFNAME_STR
        "Display connected prefixes to advertise\n"
+       "Display details of the prefixes\n"
        OSPF6_ROUTE_ADDRESS_STR
        OSPF6_ROUTE_PREFIX_STR
        OSPF6_ROUTE_MATCH_STR
@@ -1117,12 +1116,17 @@ DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
 
 DEFUN (show_ipv6_ospf6_interface_prefix,
        show_ipv6_ospf6_interface_prefix_cmd,
-       "show ipv6 ospf6 interface prefix [<X:X::X:X|X:X::X:X/M>] [<match|detail>]",
+       "show ipv6 ospf6 interface prefix\
+          [<\
+           detail\
+           |<X:X::X:X|X:X::X:X/M> [<match|detail>]\
+         >]",
        SHOW_STR
        IP6_STR
        OSPF6_STR
        INTERFACE_STR
        "Display connected prefixes to advertise\n"
+       "Display details of the prefixes\n"
        OSPF6_ROUTE_ADDRESS_STR
        OSPF6_ROUTE_PREFIX_STR
        OSPF6_ROUTE_MATCH_STR