Merge pull request #3368 from pacovn/static_analysis__ISO_C_empty_initializer

[mirror_frr.git] / isisd / isis_events.c

diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 342787af302c91cb10060f3db87e458371aecd25..9f58c24b71be856585f10f5c091f1ff485ab4093 100644 (file)
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -134,7 +134,7 @@ static void circuit_resign_level(struct isis_circuit *circuit, int level)
                circuit->lsp_regenerate_pending[idx] = 0;
                circuit->u.bc.run_dr_elect[idx] = 0;
                if (circuit->u.bc.lan_neighs[idx] != NULL)
-                       list_delete_and_null(&circuit->u.bc.lan_neighs[idx]);
+                       list_delete(&circuit->u.bc.lan_neighs[idx]);
        }
 
        return;
@@ -216,25 +216,6 @@ void isis_circuit_is_type_set(struct isis_circuit *circuit, int newtype)
  *
  * ***********************************************************************/
 
-void isis_event_adjacency_state_change(struct isis_adjacency *adj, int newstate)
-{
-       /* adjacency state change event.
-        * - the only proto-type was supported */
-
-       /* invalid arguments */
-       if (!adj || !adj->circuit || !adj->circuit->area)
-               return;
-
-       if (isis->debugs & DEBUG_EVENTS)
-               zlog_debug("ISIS-Evt (%s) Adjacency State change",
-                          adj->circuit->area->area_tag);
-
-       /* LSP generation again */
-       lsp_regenerate_schedule(adj->circuit->area, IS_LEVEL_1 | IS_LEVEL_2, 0);
-
-       return;
-}
-
 /* events supporting code */
 
 int isis_event_dis_status_change(struct thread *thread)