Merge pull request #1264 from donaldsharp/linklist

Linklist api cleanup

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/if.c b/lib/if.c
index 7d27229656..34de2c8d8b 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -191,8 +191,8 @@ void if_delete(struct interface *ifp)
 
 	if_delete_retain(ifp);
 
-	list_free(ifp->connected);
-	list_free(ifp->nbr_connected);
+	list_delete_and_null(&ifp->connected);
+	list_delete_and_null(&ifp->nbr_connected);
 
 	if_link_params_free(ifp);
 
@@ -1095,8 +1095,7 @@ void if_terminate(struct list **intf_list)
 		if_delete(ifp);
 	}
 
-	list_delete(*intf_list);
-	*intf_list = NULL;
+	list_delete_and_null(intf_list);
 }
 
 const char *if_link_type_str(enum zebra_link_type llt)