From 50cd432c7462652ffb24441fea1a244264638539 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Thu, 7 Apr 2022 17:48:53 +0200 Subject: Drop STANDALONE mode STANDALONE mode was used to build flashrom without having support for file handling. This was relevant to build libflashrom on top of libpayload. For a while now, the code which is covered by STANDALONE has moved to cli_*.c and is not used for libflashrom. Therefore we can drop STANDALONE mode. Change-Id: I58fb82270a9884a323d9850176708d230fdc5165 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/63469 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Nico Huber Reviewed-by: Angel Pons --- cli_output.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cli_output.c') diff --git a/cli_output.c b/cli_output.c index e12446d50..629db676d 100644 --- a/cli_output.c +++ b/cli_output.c @@ -24,7 +24,6 @@ enum flashrom_log_level verbose_screen = FLASHROM_MSG_INFO; enum flashrom_log_level verbose_logfile = FLASHROM_MSG_DEBUG2; -#ifndef STANDALONE static FILE *logfile = NULL; int close_logfile(void) @@ -64,7 +63,6 @@ void start_logging(void) print_version(); verbose_screen = oldverbose_screen; } -#endif /* !STANDALONE */ /* Please note that level is the verbosity, not the importance of the message. */ int flashrom_print_cb(enum flashrom_log_level level, const char *fmt, va_list ap) @@ -85,13 +83,13 @@ int flashrom_print_cb(enum flashrom_log_level level, const char *fmt, va_list ap if (level != FLASHROM_MSG_SPEW) fflush(output_type); } -#ifndef STANDALONE + if ((level <= verbose_logfile) && logfile) { ret = vfprintf(logfile, fmt, logfile_args); if (level != FLASHROM_MSG_SPEW) fflush(logfile); } -#endif /* !STANDALONE */ + va_end(logfile_args); return ret; } -- cgit v1.2.3