Now that we've simplified how usage() works, nothing ever sets the
log_to_stdout flag. Eliminate it.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
log.c | 8 +++-----
log.h | 1 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/log.c b/log.c
index e3630c35..aaf2beb5 100644
--- a/log.c
+++ b/log.c
@@ -46,18 +46,16 @@ static char log_header[BUFSIZ]; /* File header, written back on cuts
*/
static time_t log_start; /* Start timestamp */
int log_trace; /* --trace mode enabled */
-int log_to_stdout; /* Print to stdout instead of stderr */
void vlogmsg(int pri, const char *format, va_list ap)
{
bool debug_print = (log_mask & LOG_MASK(LOG_DEBUG)) && log_file == -1;
bool early_print = LOG_PRI(log_mask) == LOG_EARLY;
- FILE *out = log_to_stdout ? stdout : stderr;
struct timespec tp;
if (debug_print) {
clock_gettime(CLOCK_REALTIME, &tp);
- fprintf(out, "%lli.%04lli: ",
+ fprintf(stderr, "%lli.%04lli: ",
(long long int)tp.tv_sec - log_start,
(long long int)tp.tv_nsec / (100L * 1000));
}
@@ -75,9 +73,9 @@ void vlogmsg(int pri, const char *format, va_list ap)
}
if (debug_print || (early_print && !(log_opt & LOG_PERROR))) {
- (void)vfprintf(out, format, ap);
+ (void)vfprintf(stderr, format, ap);
if (format[strlen(format)] != '\n')
- fprintf(out, "\n");
+ fprintf(stderr, "\n");
}
}
diff --git a/log.h b/log.h
index 9c38182f..e0aab5a9 100644
--- a/log.h
+++ b/log.h
@@ -28,7 +28,6 @@ void logmsg(int pri, const char *format, ...)
} while (0)
extern int log_trace;
-extern int log_to_stdout;
void trace_init(int enable);
#define trace(...) \
do { \
--
2.45.1