From 3fdb2dd9dd8b4ab3517896092dd1b677d191adf9 Mon Sep 17 00:00:00 2001 From: hasso Date: Wed, 28 Sep 2005 18:45:54 +0000 Subject: * *.c: Massive cleanup of lists loops. Stop abusing ALL_LIST_ELEMENTS. Replace XMALLOC + memset with XCALLOC. Fix some indentation issues. The only really significant change is simplified isis_delete_adj function in isis_adjacency.c. --- isisd/isis_dr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'isisd/isis_dr.c') diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index 335946c8..8d306c8f 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -130,7 +130,7 @@ int isis_dr_elect (struct isis_circuit *circuit, int level) { struct list *adjdb; - struct listnode *node, *nnode; + struct listnode *node; struct isis_adjacency *adj, *adj_dr = NULL; struct list *list = list_new (); u_char own_prio; @@ -152,7 +152,7 @@ isis_dr_elect (struct isis_circuit *circuit, int level) /* * Loop the adjacencies and find the one with the biggest priority */ - for (ALL_LIST_ELEMENTS (list, node, nnode, adj)) + for (ALL_LIST_ELEMENTS_RO (list, node, adj)) { /* clear flag for show output */ adj->dis_record[level - 1].dis = ISIS_IS_NOT_DIS; @@ -214,7 +214,7 @@ isis_dr_elect (struct isis_circuit *circuit, int level) */ /* rotate the history log */ - for (ALL_LIST_ELEMENTS (list, node, nnode, adj)) + for (ALL_LIST_ELEMENTS_RO (list, node, adj)) isis_check_dr_change (adj, level); /* commence */ @@ -234,7 +234,7 @@ isis_dr_elect (struct isis_circuit *circuit, int level) * if yes rotate the history log */ - for (ALL_LIST_ELEMENTS (list, node, nnode, adj)) + for (ALL_LIST_ELEMENTS_RO (list, node, adj)) isis_check_dr_change (adj, level); /* -- cgit v1.2.1