125d0154e
Nguyễn Thái Ngọc Duy
2010-04-09
Subject
Exclude syslog code if FEATURE_SYSLOG is not set
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/info_msg.c+9 -3
| @@ -8,7 +8,9 @@ | |
| */ | |
| #include "libbb.h" | |
| - | #include <syslog.h> |
| + | #if ENABLE_FEATURE_SYSLOG |
| + | # include <syslog.h> |
| + | #endif |
| void FAST_FUNC bb_info_msg(const char *s, ...) | |
| { | |
| @@ -24,8 +26,10 @@ void FAST_FUNC bb_info_msg(const char *s, ...) | |
| vprintf(s, p); | |
| fputs(msg_eol, stdout); | |
| } | |
| - | if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG)) |
| + | # if ENABLE_FEATURE_SYSLOG |
| + | if (logmode & LOGMODE_SYSLOG) |
| vsyslog(LOG_INFO, s, p2); | |
| + | # endif |
| va_end(p2); | |
| va_end(p); | |
| #else | |
| @@ -42,8 +46,10 @@ void FAST_FUNC bb_info_msg(const char *s, ...) | |
| if (used < 0) | |
| return; | |
| - | if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG)) |
| + | # if ENABLE_FEATURE_SYSLOG |
| + | if (logmode & LOGMODE_SYSLOG) |
| syslog(LOG_INFO, "%s", msg); | |
| + | # endif |
| if (logmode & LOGMODE_STDIO) { | |
| fflush_all(); | |
| /* used = strlen(msg); - must be true already */ | |
libbb/verror_msg.c+7 -2
| @@ -6,9 +6,10 @@ | |
| * | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | |
| #include "libbb.h" | |
| - | #include <syslog.h> |
| + | #if ENABLE_FEATURE_SYSLOG |
| + | # include <syslog.h> |
| + | #endif |
| smallint logmode = LOGMODE_STDIO; | |
| const char *msg_eol = "\n"; | |
| @@ -67,9 +68,11 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr) | |
| fflush_all(); | |
| full_write(STDERR_FILENO, msg, used); | |
| } | |
| + | #if ENABLE_FEATURE_SYSLOG |
| if (logmode & LOGMODE_SYSLOG) { | |
| syslog(LOG_ERR, "%s", msg + applet_len); | |
| } | |
| + | #endif |
| free(msg); | |
| } | |
| @@ -128,9 +131,11 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr) | |
| fflush_all(); | |
| writev(STDERR_FILENO, iov, 3); | |
| } | |
| + | # if ENABLE_FEATURE_SYSLOG |
| if (logmode & LOGMODE_SYSLOG) { | |
| syslog(LOG_ERR, "%s", msgc); | |
| } | |
| + | # endif |
| free(msgc); | |
| } | |
| #endif | |