Merge branch 'master' into type5-default-originate

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/vrf.c b/lib/vrf.c
index 2e15fa2f5c..02946df2bc 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -419,12 +419,17 @@ void vrf_terminate(void)
 		zlog_debug("%s: Shutting down vrf subsystem",
 			   __PRETTY_FUNCTION__);
 
-	while ((vrf = RB_ROOT(vrf_id_head, &vrfs_by_id)) != NULL) {
+	while (!RB_EMPTY(vrf_id_head, &vrfs_by_id)) {
+		vrf = RB_ROOT(vrf_id_head, &vrfs_by_id);
+
 		/* Clear configured flag and invoke delete. */
 		UNSET_FLAG(vrf->status, VRF_CONFIGURED);
 		vrf_delete(vrf);
 	}
-	while ((vrf = RB_ROOT(vrf_name_head, &vrfs_by_name)) != NULL) {
+
+	while (!RB_EMPTY(vrf_name_head, &vrfs_by_name)) {
+		vrf = RB_ROOT(vrf_name_head, &vrfs_by_name);
+
 		/* Clear configured flag and invoke delete. */
 		UNSET_FLAG(vrf->status, VRF_CONFIGURED);
 		vrf_delete(vrf);