diff options
| author | Nico Huber <nico.huber@secunet.com> | 2017-06-19 12:38:39 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-06-20 13:26:20 +0200 |
| commit | e8e7a80e6b876710bebaa9f5a0b6f5e083d47516 (patch) | |
| tree | c559486e6b3eadcbcd5ce7667bb0c8154836858e | |
| parent | 1b172f2da5573bd8b1732921af1b25a2cc739572 (diff) | |
| download | flashrom-e8e7a80e6b876710bebaa9f5a0b6f5e083d47516.tar.gz flashrom-e8e7a80e6b876710bebaa9f5a0b6f5e083d47516.tar.bz2 flashrom-e8e7a80e6b876710bebaa9f5a0b6f5e083d47516.zip | |
fixup! Add a convenient libflashrom interface
Update `enum flashrom_log_level` to match `enum msglevel` again.
They diverged already. Found by clang.
Change-Id: Icf175c5f2a415365bd756ca813e724f6797459b2
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20267
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
| -rw-r--r-- | libflashrom.c | 2 | ||||
| -rw-r--r-- | libflashrom.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libflashrom.c b/libflashrom.c index 1176e0205..962e96fca 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -90,7 +90,7 @@ int print(const enum msglevel level, const char *const fmt, ...) int ret; va_list args; va_start(args, fmt); - ret = global_log_callback(level, fmt, args); + ret = global_log_callback((enum flashrom_log_level)level, fmt, args); va_end(args); return ret; } diff --git a/libflashrom.h b/libflashrom.h index 09a88c412..c5d972efe 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -29,10 +29,11 @@ int flashrom_shutdown(void); /** @ingroup flashrom-general */ enum flashrom_log_level { /* This has to match enum msglevel. */ FLASHROM_MSG_ERROR = 0, - FLASHROM_MSG_INFO = 1, - FLASHROM_MSG_DEBUG = 2, - FLASHROM_MSG_DEBUG2 = 3, - FLASHROM_MSG_SPEW = 4, + FLASHROM_MSG_WARN = 1, + FLASHROM_MSG_INFO = 2, + FLASHROM_MSG_DEBUG = 3, + FLASHROM_MSG_DEBUG2 = 4, + FLASHROM_MSG_SPEW = 5, }; /** @ingroup flashrom-general */ typedef int(flashrom_log_callback)(enum flashrom_log_level, const char *format, va_list); |