summaryrefslogtreecommitdiffstats
path: root/lib/log.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/log.c')
-rw-r--r--lib/log.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/lib/log.c b/lib/log.c
index 9fc19ff68..6330c5370 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -177,9 +177,8 @@ static void time_print(FILE *fp, struct timestamp_control *ctl)
static void vzlog_file(struct zlog *zl, struct timestamp_control *tsctl,
- const char *proto_str, int record_priority,
- int priority, FILE *fp, const char *format,
- va_list args)
+ const char *proto_str, int record_priority, int priority,
+ FILE *fp, const char *format, va_list args)
{
va_list ac;
@@ -237,8 +236,8 @@ void vzlog(int priority, const char *format, va_list args)
/* File output. */
if ((priority <= zl->maxlvl[ZLOG_DEST_FILE]) && zl->fp)
- vzlog_file(zl, &tsctl, proto_str, zl->record_priority,
- priority, zl->fp, format, args);
+ vzlog_file(zl, &tsctl, proto_str, zl->record_priority, priority,
+ zl->fp, format, args);
/* fixed-config logging to stderr while we're stating up & haven't
* daemonized / reached mainloop yet
@@ -246,11 +245,11 @@ void vzlog(int priority, const char *format, va_list args)
* note the "else" on stdout output -- we don't want to print the same
* message to both stderr and stdout. */
if (zlog_startup_stderr && priority <= LOG_WARNING)
- vzlog_file(zl, &tsctl, proto_str, 1,
- priority, stderr, format, args);
+ vzlog_file(zl, &tsctl, proto_str, 1, priority, stderr, format,
+ args);
else if (priority <= zl->maxlvl[ZLOG_DEST_STDOUT])
- vzlog_file(zl, &tsctl, proto_str, zl->record_priority,
- priority, stdout, format, args);
+ vzlog_file(zl, &tsctl, proto_str, zl->record_priority, priority,
+ stdout, format, args);
/* Terminal monitor. */
if (priority <= zl->maxlvl[ZLOG_DEST_MONITOR])
@@ -1114,10 +1113,9 @@ void zlog_hexdump(const void *mem, unsigned int len)
printing */
s += sprintf(s, " ");
- else if (
- isprint((int)((const char *)mem)
- [j])) /* printable char
- */
+ else if (isprint((int)((const char *)mem)
+ [j])) /* printable char
+ */
s += sprintf(
s, "%c",
0xFF & ((const char *)mem)[j]);