From dd8376febd9523cf0e7263b9e5100f8af718d2b5 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Tue, 23 Feb 2016 12:49:45 +0100
Subject: [PATCH] lib: remove remaining struct zlog * args

These don't serve any purpose either.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---
 bgpd/bgp_main.c            |  2 +-
 bgpd/rfapi/rfapi_vty.c     |  2 +-
 isisd/isis_main.c          |  2 +-
 ldpd/ldpd.c                |  2 +-
 lib/command.c              | 22 +++++++++++-----------
 lib/grammar_sandbox_main.c |  6 +++---
 lib/log.c                  | 33 +++++++++++----------------------
 lib/log.h                  | 11 +++++------
 nhrpd/nhrp_main.c          |  4 ++--
 ospf6d/ospf6_main.c        |  2 +-
 ospfd/ospf_main.c          |  2 +-
 pimd/pim_signals.c         |  2 +-
 ripd/rip_main.c            |  2 +-
 ripngd/ripng_main.c        |  2 +-
 tests/lib/cli/common_cli.c |  6 +++---
 tests/lib/test_segv.c      |  6 +++---
 tests/lib/test_sig.c       |  8 ++++----
 watchfrr/watchfrr.c        |  6 +++---
 zebra/main.c               |  2 +-
 zebra/test_main.c          |  2 +-
 20 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index b2b7eec3a3..5bf200727a 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -163,7 +163,7 @@ sigint (void)
 void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 /*
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 8095999163..956005a1bf 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -411,7 +411,7 @@ rfapiStream2Vty (
       *fp = (int (*)(void *, const char *,...)) rfapiDebugPrintf;
       *outstream = NULL;
       *vty_newline = str_vty_newline (*vty);
-      return (vzlog_test (NULL, LOG_DEBUG));
+      return (vzlog_test (LOG_DEBUG));
     }
 
   if (((uintptr_t) stream == (uintptr_t) 1) ||
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 8c48c7e27c..a6ad424ace 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -155,7 +155,7 @@ void
 sigusr1 (void)
 {
   zlog_debug ("SIGUSR1 received");
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t isisd_signals[] =
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index dc263875e2..98ea5ca53e 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -141,7 +141,7 @@ sigint(void)
 static void
 sigusr1(void)
 {
-	zlog_rotate(NULL);
+	zlog_rotate();
 }
 
 static struct quagga_signal_t ldp_signals[] =
diff --git a/lib/command.c b/lib/command.c
index 843529b36f..597e5a06c8 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2234,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;
 }
 
@@ -2253,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;
 }
 
@@ -2268,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;
 }
 
@@ -2287,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;
 }
 
@@ -2322,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);
@@ -2376,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);
@@ -2399,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;
   }
 }
@@ -2418,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;
 }
 
diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c
index fa925c4647..681d4da440 100644
--- a/lib/grammar_sandbox_main.c
+++ b/lib/grammar_sandbox_main.c
@@ -42,9 +42,9 @@ int main(int argc, char **argv)
 
   openzlog ("grammar_sandbox", "NONE", 0,
                            LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+  zlog_set_level (ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level (ZLOG_DEST_STDOUT, LOG_DEBUG);
+  zlog_set_level (ZLOG_DEST_MONITOR, ZLOG_DISABLED);
 
   /* Library inits. */
   cmd_init (1);
diff --git a/lib/log.c b/lib/log.c
index 8986a8ada7..bf4d3726d3 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -239,11 +239,9 @@ vzlog (int priority, const char *format, va_list args)
 }
 
 int 
-vzlog_test (struct zlog *zl, int priority)
+vzlog_test (int priority)
 {
-  /* If zlog is not specified, use default one. */
-  if (zl == NULL)
-    zl = zlog_default;
+  struct zlog *zl = zlog_default;
 
   /* When zlog_default is also NULL, use stderr for logging. */
   if (zl == NULL)
@@ -756,26 +754,20 @@ closezlog (void)
 
 /* Called from command.c. */
 void
-zlog_set_level (struct zlog *zl, zlog_dest_t dest, int log_level)
+zlog_set_level (zlog_dest_t dest, int log_level)
 {
-  if (zl == NULL)
-    zl = zlog_default;
-
-  zl->maxlvl[dest] = log_level;
+  zlog_default->maxlvl[dest] = log_level;
 }
 
 int
-zlog_set_file (struct zlog *zl, const char *filename, int log_level)
+zlog_set_file (const char *filename, int log_level)
 {
+  struct zlog *zl = zlog_default;
   FILE *fp;
   mode_t oldumask;
 
   /* There is opend file.  */
-  zlog_reset_file (zl);
-
-  /* Set default zl. */
-  if (zl == NULL)
-    zl = zlog_default;
+  zlog_reset_file ();
 
   /* Open file. */
   oldumask = umask (0777 & ~LOGFILE_MASK);
@@ -795,10 +787,9 @@ zlog_set_file (struct zlog *zl, const char *filename, int log_level)
 
 /* Reset opend file. */
 int
-zlog_reset_file (struct zlog *zl)
+zlog_reset_file (void)
 {
-  if (zl == NULL)
-    zl = zlog_default;
+  struct zlog *zl = zlog_default;
 
   if (zl->fp)
     fclose (zl->fp);
@@ -815,13 +806,11 @@ zlog_reset_file (struct zlog *zl)
 
 /* Reopen log file. */
 int
-zlog_rotate (struct zlog *zl)
+zlog_rotate (void)
 {
+  struct zlog *zl = zlog_default;
   int level;
 
-  if (zl == NULL)
-    zl = zlog_default;
-
   if (zl->fp)
     fclose (zl->fp);
   zl->fp = NULL;
diff --git a/lib/log.h b/lib/log.h
index 3d887fdbbb..889a462fe0 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -114,15 +114,15 @@ extern void zlog_thread_info (int log_level);
    argument is ZLOG_DISABLED, then the destination is disabled.
    This function should not be used for file logging (use zlog_set_file
    or zlog_reset_file instead). */
-extern void zlog_set_level (struct zlog *zl, zlog_dest_t, int log_level);
+extern void zlog_set_level (zlog_dest_t, int log_level);
 
 /* Set logging to the given filename at the specified level. */
-extern int zlog_set_file (struct zlog *zl, const char *filename, int log_level);
+extern int zlog_set_file (const char *filename, int log_level);
 /* Disable file logging. */
-extern int zlog_reset_file (struct zlog *zl);
+extern int zlog_reset_file (void);
 
 /* Rotate log. */
-extern int zlog_rotate (struct zlog *);
+extern int zlog_rotate (void);
 
 /* For hackey message lookup and check */
 #define LOOKUP_DEF(x, y, def) mes_lookup(x, x ## _max, y, def, #x)
@@ -168,8 +168,7 @@ extern void zlog_hexdump(const void *mem, unsigned int len);
 extern const char *zlog_sanitize(char *buf, size_t bufsz, const void *in, size_t inlen);
 
 
-extern int 
-vzlog_test (struct zlog *zl, int priority);
+extern int vzlog_test (int priority);
 
 /* structure useful for avoiding repeated rendering of the same timestamp */
 struct timestamp_control {
diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index 9633999855..2f6ee1c04f 100644
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -77,7 +77,7 @@ static void parse_arguments(int argc, char **argv)
 
 static void nhrp_sigusr1(void)
 {
-	zlog_rotate(NULL);
+	zlog_rotate();
 }
 
 static void nhrp_request_stop(void)
@@ -99,7 +99,7 @@ static void nhrp_request_stop(void)
 
 	debugf(NHRP_DEBUG_COMMON, "Done.");
 
-	closezlog(zlog_default);
+	closezlog();
 
 	exit(0);
 }
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index b4d2cbe8d3..54ae4645ad 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -150,7 +150,7 @@ static void
 sigusr1 (void)
 {
   zlog_info ("SIGUSR1 received");
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t ospf6_signals[] =
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 022bb2669f..fd17458d32 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -127,7 +127,7 @@ sigint (void)
 static void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t ospf_signals[] =
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 11360e00cb..053ef6a67b 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -55,7 +55,7 @@ static void pim_sigterm()
 
 static void pim_sigusr1()
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t pimd_signals[] =
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index a9382d942f..62ea6dd078 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -108,7 +108,7 @@ sigint (void)
 static void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 static struct quagga_signal_t ripd_signals[] =
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index c24ca28c36..9d97df5c41 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -111,7 +111,7 @@ sigint (void)
 static void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t ripng_signals[] =
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 5176df189e..56db460438 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -72,9 +72,9 @@ main (int argc, char **argv)
 
   openzlog("common-cli", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID,
            LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, LOG_DEBUG);
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_MONITOR, LOG_DEBUG);
 
   /* Library inits. */
   cmd_init (1);
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index aa806c77c2..dfc9d5f482 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -50,9 +50,9 @@ main (void)
   signal_init (master, array_size(sigs), sigs);
 
   openzlog("testsegv", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
+  zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
 
   thread_execute (master, threadfunc, 0, 0);
 
diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index 641156808a..10bce2303e 100644
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -66,10 +66,10 @@ main (void)
   signal_init (master, array_size(sigs), sigs);
 
   openzlog("testsig", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
-  zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
-  zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG);
-  zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
-  
+  zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
+  zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
+  zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+
   while (thread_fetch (master, &t))
     thread_call (&t);
 
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 3bf2783ee1..413a631005 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -1274,16 +1274,16 @@ int main(int argc, char **argv)
 
 	master = frr_init();
 
-	zlog_set_level(NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
+	zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
 	if (watchfrr_di.daemon_mode) {
-		zlog_set_level(NULL, ZLOG_DEST_SYSLOG, MIN(gs.loglevel, LOG_DEBUG));
+		zlog_set_level(ZLOG_DEST_SYSLOG, MIN(gs.loglevel, LOG_DEBUG));
 		if (daemon (0, 0) < 0) {
 			fprintf(stderr, "Watchquagga daemon failed: %s",
 					strerror(errno));
 			exit (1);
 		}
 	} else
-		zlog_set_level(NULL, ZLOG_DEST_STDOUT, MIN(gs.loglevel, LOG_DEBUG));
+		zlog_set_level(ZLOG_DEST_STDOUT, MIN(gs.loglevel, LOG_DEBUG));
 
 	watchfrr_vty_init();
 
diff --git a/zebra/main.c b/zebra/main.c
index e951ca6941..bbfae3bb5b 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -177,7 +177,7 @@ sigint (void)
 static void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t zebra_signals[] =
diff --git a/zebra/test_main.c b/zebra/test_main.c
index 2996b45464..a80b4c87c4 100644
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -181,7 +181,7 @@ sigint (void)
 static void
 sigusr1 (void)
 {
-  zlog_rotate (NULL);
+  zlog_rotate();
 }
 
 struct quagga_signal_t zebra_signals[] =