diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | cli_classic.c | 15 | ||||
| -rw-r--r-- | cli_output.c | 6 | ||||
| -rw-r--r-- | flash.h | 2 | ||||
| -rw-r--r-- | tests/meson.build | 1 |
5 files changed, 2 insertions, 23 deletions
@@ -290,7 +290,6 @@ ifeq ($(MAKECMDGOALS),) .DEFAULT_GOAL := libflashrom.a $(info Setting default goal to libflashrom.a) endif -FLASHROM_CFLAGS += -DSTANDALONE $(call mark_unsupported,CONFIG_DUMMY) # libpayload does not provide the romsize field in struct pci_dev that the atapromise code requires. $(call mark_unsupported,CONFIG_ATAPROMISE) diff --git a/cli_classic.c b/cli_classic.c index 0b6e79c32..c543ff7eb 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -112,12 +112,10 @@ static int check_filename(char *filename, const char *type) /* Ensure a file is open by means of fstat */ static bool check_file(FILE *file) { -#ifndef STANDALONE struct stat statbuf; if (fstat(fileno(file), &statbuf) < 0) return false; -#endif /* !STANDALONE */ return true; } @@ -279,9 +277,7 @@ int main(int argc, char *argv[]) char *referencefile = NULL; char *layoutfile = NULL; char *fmapfile = NULL; -#ifndef STANDALONE char *logfile = NULL; -#endif /* !STANDALONE */ char *tempstr = NULL; char *pparam = NULL; struct layout_include_args *include_args = NULL; @@ -481,9 +477,6 @@ int main(int argc, char *argv[]) exit(0); break; case 'o': -#ifdef STANDALONE - cli_classic_abort_usage("Log file not supported in standalone mode. Aborting.\n"); -#else /* STANDALONE */ if (logfile) { fprintf(stderr, "Warning: -o/--output specified multiple times.\n"); free(logfile); @@ -493,7 +486,6 @@ int main(int argc, char *argv[]) if (logfile[0] == '\0') { cli_classic_abort_usage("No log filename specified.\n"); } -#endif /* STANDALONE */ break; default: cli_classic_abort_usage(NULL); @@ -511,13 +503,10 @@ int main(int argc, char *argv[]) cli_classic_abort_usage(NULL); if (referencefile && check_filename(referencefile, "reference")) cli_classic_abort_usage(NULL); - -#ifndef STANDALONE if (logfile && check_filename(logfile, "log")) cli_classic_abort_usage(NULL); if (logfile && open_logfile(logfile)) cli_classic_abort_usage(NULL); -#endif /* !STANDALONE */ #if CONFIG_PRINT_WIKI == 1 if (list_supported_wiki) { @@ -532,9 +521,7 @@ int main(int argc, char *argv[]) goto out; } -#ifndef STANDALONE start_logging(); -#endif /* !STANDALONE */ print_buildinfo(); msg_gdbg("Command line (%i args):", argc - 1); @@ -808,9 +795,7 @@ out: /* clean up global variables */ free((char *)chip_to_probe); /* Silence! Freeing is not modifying contents. */ chip_to_probe = NULL; -#ifndef STANDALONE free(logfile); ret |= close_logfile(); -#endif /* !STANDALONE */ return ret; } 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; } @@ -442,11 +442,9 @@ void print_chip_support_status(const struct flashchip *chip); /* cli_output.c */ extern enum flashrom_log_level verbose_screen; extern enum flashrom_log_level verbose_logfile; -#ifndef STANDALONE int open_logfile(const char * const filename); int close_logfile(void); void start_logging(void); -#endif int flashrom_print_cb(enum flashrom_log_level level, const char *fmt, va_list ap); /* Let gcc and clang check for correct printf-style format strings. */ int print(enum flashrom_log_level level, const char *fmt, ...) diff --git a/tests/meson.build b/tests/meson.build index 90e0df114..d3b46b193 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -102,7 +102,6 @@ flashrom_tests = executable('flashrom_unit_tests', cargs, '-ffunction-sections', '-fdata-sections', - # '-DSTANDALONE', ], export_dynamic : true, link_args : mocks, |