Add user `frr` into group `frrvty`

[mirror_frr.git] / isisd / isis_spf.c

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 81c1f457c0de79df243e0ff526f08880106623ae..041f2ed3f6622e6b3664599279f37cab34c10312 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -189,11 +189,6 @@ isis_vertex_new (void *id, enum vertextype vtype)
   struct isis_vertex *vertex;
 
   vertex = XCALLOC (MTYPE_ISIS_VERTEX, sizeof (struct isis_vertex));
-  if (vertex == NULL)
-    {
-      zlog_err ("isis_vertex_new Out of memory!");
-      return NULL;
-    }
 
   vertex->type = vtype;
   switch (vtype)
@@ -550,13 +545,13 @@ isis_spf_add2tent (struct isis_spftree *spftree, enum vertextype vtype,
       v = listgetdata (node);
       if (v->d_N > vertex->d_N)
        {
-         list_add_node_prev (spftree->tents, node, vertex);
+         listnode_add_before (spftree->tents, node, vertex);
          break;
        }
       else if (v->d_N == vertex->d_N && v->type > vertex->type)
        {
          /*  Tie break, add according to type */
-          list_add_node_prev (spftree->tents, node, vertex);
+          listnode_add_before (spftree->tents, node, vertex);
          break;
        }
     }
@@ -1072,8 +1067,8 @@ isis_spf_preload_tent (struct isis_spftree *spftree, int level,
            {
              zlog_warn ("ISIS-Spf: No lsp (%p) found from root "
                   "to L%d DR %s on %s (ID %d)",
-                 lsp, level, rawlspid_print (lsp_id), 
-                 circuit->interface->name, circuit->circuit_id);
+                  (void *)lsp, level, rawlspid_print (lsp_id),
+                  circuit->interface->name, circuit->circuit_id);
               continue;
            }
          isis_spf_process_pseudo_lsp (spftree, lsp,
@@ -1477,7 +1472,8 @@ isis_spf_schedule6 (struct isis_area *area, int level)
 
   if (isis->debugs & DEBUG_SPF_EVENTS)
     zlog_debug ("ISIS-Spf (%s) L%d SPF scheduled %lld sec from now",
-                area->area_tag, level, (long long)(area->min_spf_interval[level-1] - diff));
+                area->area_tag, level,
+               (long long)(area->min_spf_interval[level-1] - diff));
 
   spftree->pending = 1;
 
@@ -1684,8 +1680,4 @@ isis_spf_cmds_init ()
   install_element (VIEW_NODE, &show_isis_topology_cmd);
   install_element (VIEW_NODE, &show_isis_topology_l1_cmd);
   install_element (VIEW_NODE, &show_isis_topology_l2_cmd);
-
-  install_element (ENABLE_NODE, &show_isis_topology_cmd);
-  install_element (ENABLE_NODE, &show_isis_topology_l1_cmd);
-  install_element (ENABLE_NODE, &show_isis_topology_l2_cmd);
 }