From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 6 Jan 2013 12:11:04 +0000 (+0100)
Subject: syslogd: convert dummy functions to statics and get rid of IF_FEATURE_* checks
X-Git-Tag: 1_21_0~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9980707efc3735574f89ca3fbc686374c6225e3e;p=oweals%2Fbusybox.git

syslogd: convert dummy functions to statics and get rid of IF_FEATURE_* checks

As suggested by Mike. No bloat-o-meter difference, but a bit nicer to look at.
We cannot convert the call to log_to_shmem() as it checks for G.shbuf outside
the function, and G.shbuf is only available when IPC support is enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 2053cb146..f349f4711 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -529,8 +529,8 @@ static void log_to_shmem(const char *msg)
 		printf("tail:%d\n", G.shbuf->tail);
 }
 #else
-void ipcsyslog_cleanup(void);
-void ipcsyslog_init(void);
+static void ipcsyslog_cleanup(void) {}
+static void ipcsyslog_init(void) {}
 void log_to_shmem(const char *msg);
 #endif /* FEATURE_IPC_SYSLOG */
 
@@ -567,9 +567,9 @@ static void log_to_kmsg(int pri, const char *msg)
 	write(G.kmsgfd, G.printbuf, sprintf(G.printbuf, "<%d>%s\n", pri, msg));
 }
 #else
-void kmsg_init(void);
-void kmsg_cleanup(void);
-void log_to_kmsg(int pri, const char *msg);
+static void kmsg_init(void) {}
+static void kmsg_cleanup(void) {}
+static void log_to_kmsg(int pri UNUSED_PARAM, const char *msg UNUSED_PARAM) {}
 #endif /* FEATURE_KMSG_SYSLOG */
 
 /* Print a message to the log file. */
@@ -706,7 +706,7 @@ static void timestamp_and_log(int pri, char *msg, int len)
 	}
 	timestamp[15] = '\0';
 
-	if (ENABLE_FEATURE_KMSG_SYSLOG && (option_mask32 & OPT_kmsg)) {
+	if (option_mask32 & OPT_kmsg) {
 		log_to_kmsg(pri, msg);
 		return;
 	}
@@ -881,11 +881,10 @@ static void do_syslogd(void)
 #endif
 	sock_fd = create_socket();
 
-	if (ENABLE_FEATURE_IPC_SYSLOG && (option_mask32 & OPT_circularlog)) {
+	if (option_mask32 & OPT_circularlog)
 		ipcsyslog_init();
-	}
 
-	if (ENABLE_FEATURE_KMSG_SYSLOG && (option_mask32 & OPT_kmsg))
+	if (option_mask32 & OPT_kmsg)
 		kmsg_init();
 
 	timestamp_and_log_internal("syslogd started: BusyBox v" BB_VER);
@@ -974,9 +973,8 @@ static void do_syslogd(void)
 	timestamp_and_log_internal("syslogd exiting");
 	puts("syslogd exiting");
 	remove_pidfile(CONFIG_PID_FILE_PATH "/syslogd.pid");
-	if (ENABLE_FEATURE_IPC_SYSLOG)
-		ipcsyslog_cleanup();
-	if (ENABLE_FEATURE_KMSG_SYSLOG && (option_mask32 & OPT_kmsg))
+	ipcsyslog_cleanup();
+	if (option_mask32 & OPT_kmsg)
 		kmsg_cleanup();
 	kill_myself_with_sig(bb_got_signal);
 #undef recvbuf