proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: remove remaining struct zlog * args

Browse Source 
These don't serve any purpose either.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2016-02-23 12:49:45 +01:00 committed by David Lamparter
parent bf1013e6c4
commit dd8376febd
20 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_main.c
View File

@ -163,7 +163,7 @@ sigint (void)
void void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
/* /*

2
bgpd/rfapi/rfapi_vty.c
View File

@ -411,7 +411,7 @@ rfapiStream2Vty (
*fp = (int (*)(void *, const char *,...)) rfapiDebugPrintf; *fp = (int (*)(void *, const char *,...)) rfapiDebugPrintf;
*outstream = NULL; *outstream = NULL;
*vty_newline = str_vty_newline (*vty); *vty_newline = str_vty_newline (*vty);
return (vzlog_test (NULL, LOG_DEBUG)); return (vzlog_test (LOG_DEBUG));
} }
if (((uintptr_t) stream == (uintptr_t) 1) || if (((uintptr_t) stream == (uintptr_t) 1) ||

2
isisd/isis_main.c
View File

@ -155,7 +155,7 @@ void
sigusr1 (void) sigusr1 (void)
{ {
zlog_debug ("SIGUSR1 received"); zlog_debug ("SIGUSR1 received");
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t isisd_signals[] = struct quagga_signal_t isisd_signals[] =

2
ldpd/ldpd.c
View File

@ -141,7 +141,7 @@ sigint(void)
static void static void
sigusr1(void) sigusr1(void)
{ {
zlog_rotate(NULL); zlog_rotate();
} }
static struct quagga_signal_t ldp_signals[] = static struct quagga_signal_t ldp_signals[] =

22
lib/command.c
View File

@ -2234,14 +2234,14 @@ DEFUN (config_log_stdout,
if (argc == idx_log_level) 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; return CMD_SUCCESS;
} }
int level; int level;
if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED) if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED)
return CMD_ERR_NO_MATCH; return CMD_ERR_NO_MATCH;
zlog_set_level (NULL, ZLOG_DEST_STDOUT, level); zlog_set_level (ZLOG_DEST_STDOUT, level);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2253,7 +2253,7 @@ DEFUN (no_config_log_stdout,
"Cancel logging to stdout\n" "Cancel logging to stdout\n"
LOG_LEVEL_DESC) LOG_LEVEL_DESC)
{ {
zlog_set_level (NULL, ZLOG_DEST_STDOUT, ZLOG_DISABLED); zlog_set_level (ZLOG_DEST_STDOUT, ZLOG_DISABLED);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2268,14 +2268,14 @@ DEFUN (config_log_monitor,
if (argc == idx_log_level) 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; return CMD_SUCCESS;
} }
int level; int level;
if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED) if ((level = level_match(argv[idx_log_level]->arg)) == ZLOG_DISABLED)
return CMD_ERR_NO_MATCH; return CMD_ERR_NO_MATCH;
zlog_set_level (NULL, ZLOG_DEST_MONITOR, level); zlog_set_level (ZLOG_DEST_MONITOR, level);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2287,7 +2287,7 @@ DEFUN (no_config_log_monitor,
"Disable terminal line (monitor) logging\n" "Disable terminal line (monitor) logging\n"
LOG_LEVEL_DESC) LOG_LEVEL_DESC)
{ {
zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED); zlog_set_level (ZLOG_DEST_MONITOR, ZLOG_DISABLED);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2322,7 +2322,7 @@ set_log_file(struct vty *vty, const char *fname, int loglevel)
else else
fullpath = fname; fullpath = fname;
ret = zlog_set_file (NULL, fullpath, loglevel); ret = zlog_set_file (fullpath, loglevel);
if (p) if (p)
XFREE (MTYPE_TMP, p); XFREE (MTYPE_TMP, p);
@ -2376,7 +2376,7 @@ DEFUN (no_config_log_file,
"Logging file name\n" "Logging file name\n"
"Logging level\n") "Logging level\n")
{ {
zlog_reset_file (NULL); zlog_reset_file ();
if (host.logfile) if (host.logfile)
XFREE (MTYPE_HOST, host.logfile); XFREE (MTYPE_HOST, host.logfile);
@ -2399,12 +2399,12 @@ DEFUN (config_log_syslog,
int level; int level;
if ((level = level_match (argv[idx_log_levels]->arg)) == ZLOG_DISABLED) if ((level = level_match (argv[idx_log_levels]->arg)) == ZLOG_DISABLED)
return CMD_ERR_NO_MATCH; return CMD_ERR_NO_MATCH;
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, level); zlog_set_level (ZLOG_DEST_SYSLOG, level);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
else 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; return CMD_SUCCESS;
} }
} }
@ -2418,7 +2418,7 @@ DEFUN (no_config_log_syslog,
LOG_FACILITY_DESC LOG_FACILITY_DESC
LOG_LEVEL_DESC) LOG_LEVEL_DESC)
{ {
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED); zlog_set_level (ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

6
lib/grammar_sandbox_main.c
View File

@ -42,9 +42,9 @@ int main(int argc, char **argv)
openzlog ("grammar_sandbox", "NONE", 0, openzlog ("grammar_sandbox", "NONE", 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED); zlog_set_level (ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG); zlog_set_level (ZLOG_DEST_STDOUT, LOG_DEBUG);
zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED); zlog_set_level (ZLOG_DEST_MONITOR, ZLOG_DISABLED);
/* Library inits. */ /* Library inits. */
cmd_init (1); cmd_init (1);

33
lib/log.c
View File

@ -239,11 +239,9 @@ vzlog (int priority, const char *format, va_list args)
} }
int int
vzlog_test (struct zlog *zl, int priority) vzlog_test (int priority)
{ {
/* If zlog is not specified, use default one. */ struct zlog *zl = zlog_default;
if (zl == NULL)
zl = zlog_default;
/* When zlog_default is also NULL, use stderr for logging. */ /* When zlog_default is also NULL, use stderr for logging. */
if (zl == NULL) if (zl == NULL)
@ -756,26 +754,20 @@ closezlog (void)
/* Called from command.c. */ /* Called from command.c. */
void 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) zlog_default->maxlvl[dest] = log_level;
zl = zlog_default;
zl->maxlvl[dest] = log_level;
} }
int 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; FILE *fp;
mode_t oldumask; mode_t oldumask;
/* There is opend file. */ /* There is opend file. */
zlog_reset_file (zl); zlog_reset_file ();
/* Set default zl. */
if (zl == NULL)
zl = zlog_default;
/* Open file. */ /* Open file. */
oldumask = umask (0777 & ~LOGFILE_MASK); oldumask = umask (0777 & ~LOGFILE_MASK);
@ -795,10 +787,9 @@ zlog_set_file (struct zlog *zl, const char *filename, int log_level)
/* Reset opend file. */ /* Reset opend file. */
int int
zlog_reset_file (struct zlog *zl) zlog_reset_file (void)
{ {
if (zl == NULL) struct zlog *zl = zlog_default;
zl = zlog_default;
if (zl->fp) if (zl->fp)
fclose (zl->fp); fclose (zl->fp);
@ -815,13 +806,11 @@ zlog_reset_file (struct zlog *zl)
/* Reopen log file. */ /* Reopen log file. */
int int
zlog_rotate (struct zlog *zl) zlog_rotate (void)
{ {
struct zlog *zl = zlog_default;
int level; int level;
if (zl == NULL)
zl = zlog_default;
if (zl->fp) if (zl->fp)
fclose (zl->fp); fclose (zl->fp);
zl->fp = NULL; zl->fp = NULL;

11
lib/log.h
View File

@ -114,15 +114,15 @@ extern void zlog_thread_info (int log_level);
argument is ZLOG_DISABLED, then the destination is disabled. argument is ZLOG_DISABLED, then the destination is disabled.
This function should not be used for file logging (use zlog_set_file This function should not be used for file logging (use zlog_set_file
or zlog_reset_file instead). */ 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. */ /* 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. */ /* Disable file logging. */
extern int zlog_reset_file (struct zlog *zl); extern int zlog_reset_file (void);
/* Rotate log. */ /* Rotate log. */
extern int zlog_rotate (struct zlog *); extern int zlog_rotate (void);
/* For hackey message lookup and check */ /* For hackey message lookup and check */
#define LOOKUP_DEF(x, y, def) mes_lookup(x, x ## _max, y, def, #x) #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 const char *zlog_sanitize(char *buf, size_t bufsz, const void *in, size_t inlen);
extern int extern int vzlog_test (int priority);
vzlog_test (struct zlog *zl, int priority);
/* structure useful for avoiding repeated rendering of the same timestamp */ /* structure useful for avoiding repeated rendering of the same timestamp */
struct timestamp_control { struct timestamp_control {

4
nhrpd/nhrp_main.c
View File

@ -77,7 +77,7 @@ static void parse_arguments(int argc, char **argv)
static void nhrp_sigusr1(void) static void nhrp_sigusr1(void)
{ {
zlog_rotate(NULL); zlog_rotate();
} }
static void nhrp_request_stop(void) static void nhrp_request_stop(void)
@ -99,7 +99,7 @@ static void nhrp_request_stop(void)
debugf(NHRP_DEBUG_COMMON, "Done."); debugf(NHRP_DEBUG_COMMON, "Done.");
closezlog(zlog_default); closezlog();
exit(0); exit(0);
} }

2
ospf6d/ospf6_main.c
View File

@ -150,7 +150,7 @@ static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_info ("SIGUSR1 received"); zlog_info ("SIGUSR1 received");
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t ospf6_signals[] = struct quagga_signal_t ospf6_signals[] =

2
ospfd/ospf_main.c
View File

@ -127,7 +127,7 @@ sigint (void)
static void static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t ospf_signals[] = struct quagga_signal_t ospf_signals[] =

2
pimd/pim_signals.c
View File

@ -55,7 +55,7 @@ static void pim_sigterm()
static void pim_sigusr1() static void pim_sigusr1()
{ {
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t pimd_signals[] = struct quagga_signal_t pimd_signals[] =

2
ripd/rip_main.c
View File

@ -108,7 +108,7 @@ sigint (void)
static void static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
static struct quagga_signal_t ripd_signals[] = static struct quagga_signal_t ripd_signals[] =

2
ripngd/ripng_main.c
View File

@ -111,7 +111,7 @@ sigint (void)
static void static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t ripng_signals[] = struct quagga_signal_t ripng_signals[] =

6
tests/lib/cli/common_cli.c
View File

@ -72,9 +72,9 @@ main (int argc, char **argv)
openzlog("common-cli", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, openzlog("common-cli", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID,
LOG_DAEMON); LOG_DAEMON);
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
zlog_set_level (NULL, ZLOG_DEST_STDOUT, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_STDOUT, ZLOG_DISABLED);
zlog_set_level (NULL, ZLOG_DEST_MONITOR, LOG_DEBUG); zlog_set_level(ZLOG_DEST_MONITOR, LOG_DEBUG);
/* Library inits. */ /* Library inits. */
cmd_init (1); cmd_init (1);

6
tests/lib/test_segv.c
View File

@ -50,9 +50,9 @@ main (void)
signal_init (master, array_size(sigs), sigs); signal_init (master, array_size(sigs), sigs);
openzlog("testsegv", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON); openzlog("testsegv", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG); zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
thread_execute (master, threadfunc, 0, 0); thread_execute (master, threadfunc, 0, 0);

6
tests/lib/test_sig.c
View File

@ -66,9 +66,9 @@ main (void)
signal_init (master, array_size(sigs), sigs); signal_init (master, array_size(sigs), sigs);
openzlog("testsig", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON); openzlog("testsig", "NONE", 0, LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
zlog_set_level (NULL, ZLOG_DEST_SYSLOG, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_SYSLOG, ZLOG_DISABLED);
zlog_set_level (NULL, ZLOG_DEST_STDOUT, LOG_DEBUG); zlog_set_level(ZLOG_DEST_STDOUT, LOG_DEBUG);
zlog_set_level (NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED); zlog_set_level(ZLOG_DEST_MONITOR, ZLOG_DISABLED);
while (thread_fetch (master, &t)) while (thread_fetch (master, &t))
thread_call (&t); thread_call (&t);

6
watchfrr/watchfrr.c
View File

@ -1274,16 +1274,16 @@ int main(int argc, char **argv)
master = frr_init(); 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) { 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) { if (daemon (0, 0) < 0) {
fprintf(stderr, "Watchquagga daemon failed: %s", fprintf(stderr, "Watchquagga daemon failed: %s",
strerror(errno)); strerror(errno));
exit (1); exit (1);
} }
} else } 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(); watchfrr_vty_init();

2
zebra/main.c
View File

@ -177,7 +177,7 @@ sigint (void)
static void static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t zebra_signals[] = struct quagga_signal_t zebra_signals[] =

2
zebra/test_main.c
View File

@ -181,7 +181,7 @@ sigint (void)
static void static void
sigusr1 (void) sigusr1 (void)
{ {
zlog_rotate (NULL); zlog_rotate();
} }
struct quagga_signal_t zebra_signals[] = struct quagga_signal_t zebra_signals[] =