summaryrefslogtreecommitdiffstats
path: root/cli_output.c
diff options
context:
space:
mode:
authorThomas Heijligen <thomas.heijligen@secunet.com>2022-04-07 17:48:53 +0200
committerNico Huber <nico.h@gmx.de>2022-04-13 11:45:56 +0000
commit50cd432c7462652ffb24441fea1a244264638539 (patch)
treeb36aa129ebc8599075962fcfe0b2c779c5b08182 /cli_output.c
parent48fef95b79920611ba284a946d5950b8afeeb38b (diff)
downloadflashrom-50cd432c7462652ffb24441fea1a244264638539.tar.gz
flashrom-50cd432c7462652ffb24441fea1a244264638539.tar.bz2
flashrom-50cd432c7462652ffb24441fea1a244264638539.zip
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 <thomas.heijligen@secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63469 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'cli_output.c')
-rw-r--r--cli_output.c6
1 files changed, 2 insertions, 4 deletions
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;
}