lib: remove remaining struct zlog * args

[mirror_frr.git] / lib / command.c

diff --git a/lib/command.c b/lib/command.c
index b166d8e0daeb734895d3563c9e11e33ab53c7d87..597e5a06c88b2e112e5c74a6066c354474441042 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -1055,6 +1055,7 @@ node_parent ( enum node_type node )
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
     case BGP_IPV6M_NODE:
+    case BGP_EVPN_NODE:
       ret = BGP_NODE;
       break;
     case KEYCHAIN_KEY_NODE:
@@ -1421,6 +1422,7 @@ cmd_exit (struct vty *vty)
     case BGP_VNC_L2_GROUP_NODE:
     case BGP_IPV6_NODE:
     case BGP_IPV6M_NODE:
+    case BGP_EVPN_NODE:
       vty->node = BGP_NODE;
       break;
     case LDP_IPV4_NODE:
@@ -1489,6 +1491,7 @@ DEFUN (config_end,
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
     case BGP_IPV6M_NODE:
+    case BGP_EVPN_NODE:
     case RMAP_NODE:
     case OSPF_NODE:
     case OSPF6_NODE:
@@ -1626,7 +1629,8 @@ DEFUN (show_commandtree,
        show_commandtree_cmd,
        "show commandtree [permutations]",
        SHOW_STR
-       "Show command tree\n")
+       "Show command tree\n"
+       "Permutations that we are interested in\n")
 {
   return cmd_list_cmds (vty, argc == 3);
 }
@@ -2159,7 +2163,7 @@ DEFUN (config_logmsg,
   if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED)
     return CMD_ERR_NO_MATCH;
 
-  zlog(NULL, level, "%s", ((message = argv_concat(argv, argc, idx_message)) ? message : ""));
+  zlog(level, "%s", ((message = argv_concat(argv, argc, idx_message)) ? message : ""));
   if (message)
     XFREE(MTYPE_TMP, message);
 
@@ -2210,7 +2214,7 @@ DEFUN (show_logging,
   vty_out (vty, "%s", VTY_NEWLINE);
 
   vty_out (vty, "Protocol name: %s%s",
-           zlog_proto_names[zl->protocol], VTY_NEWLINE);
+           zl->protoname, VTY_NEWLINE);
   vty_out (vty, "Record priority: %s%s",
            (zl->record_priority ? "enabled" : "disabled"), VTY_NEWLINE);
   vty_out (vty, "Timestamp precision: %d%s",
@@ -2230,14 +2234,14 @@ DEFUN (config_log_stdout,
 
   if (argc == idx_log_level)
   {
-    zlog_set_level (NULL, ZLOG_DEST_STDOUT, zlog_default->default_lvl);
+    zlog_set_level (ZLOG_DEST_STDOUT, zlog_default->default_lvl);
     return CMD_SUCCESS;
   }
   int level;
 
   if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED)
     return CMD_ERR_NO_MATCH;
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, level);
+  zlog_set_level (ZLOG_DEST_STDOUT, level);
   return CMD_SUCCESS;
 }
 
@@ -2249,7 +2253,7 @@ DEFUN (no_config_log_stdout,
        "Cancel logging to stdout\n"
        LOG_LEVEL_DESC)
 {
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, ZLOG_DISABLED);
+  zlog_set_level (ZLOG_DEST_STDOUT, ZLOG_DISABLED);
   return CMD_SUCCESS;
 }
 
@@ -2264,14 +2268,14 @@ DEFUN (config_log_monitor,
 
   if (argc == idx_log_level)
   {
-    zlog_set_level (NULL, ZLOG_DEST_MONITOR, zlog_default->default_lvl);
+    zlog_set_level (ZLOG_DEST_MONITOR, zlog_default->default_lvl);
     return CMD_SUCCESS;
   }
   int level;
 
   if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED)
     return CMD_ERR_NO_MATCH;
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, level);
+  zlog_set_level (ZLOG_DEST_MONITOR, level);
   return CMD_SUCCESS;
 }
 
@@ -2283,7 +2287,7 @@ DEFUN (no_config_log_monitor,
        "Disable terminal line (monitor) logging\n"
        LOG_LEVEL_DESC)
 {
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+  zlog_set_level (ZLOG_DEST_MONITOR, ZLOG_DISABLED);
   return CMD_SUCCESS;
 }
 
@@ -2318,7 +2322,7 @@ set_log_file(struct vty *vty, const char *fname, int loglevel)
   else
     fullpath = fname;
 
-  ret = zlog_set_file (NULL, fullpath, loglevel);
+  ret = zlog_set_file (fullpath, loglevel);
 
   if (p)
     XFREE (MTYPE_TMP, p);
@@ -2372,7 +2376,7 @@ DEFUN (no_config_log_file,
        "Logging file name\n"
        "Logging level\n")
 {
-  zlog_reset_file (NULL);
+  zlog_reset_file ();
 
   if (host.logfile)
     XFREE (MTYPE_HOST, host.logfile);
@@ -2395,12 +2399,12 @@ DEFUN (config_log_syslog,
     int level;
     if ((level = level_match (argv[idx_log_levels]->arg)) == ZLOG_DISABLED)
       return CMD_ERR_NO_MATCH;
-    zlog_set_level (NULL, ZLOG_DEST_SYSLOG, level);
+    zlog_set_level (ZLOG_DEST_SYSLOG, level);
     return CMD_SUCCESS;
   }
   else
   {
-    zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+    zlog_set_level (ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
     return CMD_SUCCESS;
   }
 }
@@ -2414,7 +2418,7 @@ DEFUN (no_config_log_syslog,
        LOG_FACILITY_DESC
        LOG_LEVEL_DESC)
 {
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level (ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
   return CMD_SUCCESS;
 }
 
@@ -2722,7 +2726,6 @@ cmd_init (int terminal)
 
       vrf_install_commands ();
     }
-  srandom(time(NULL));
 
 #ifdef DEV_BUILD
   grammar_sandbox_init();