GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/cbfstool: Wrap logging macros in do - while 

Wrap the console logging macros with do { ... } while (0) so they act
more like functions.

Add missing semicolons to calls of these macros.

TEST=compile only

Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I721a4a93636201fa2394ec62cbe4e743cd3ad9d0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68336
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Fred Reitberger 2022-10-12 10:47:39 -04:00 committed by Felix Held
parent a261502de5
commit 9049dfdb68
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cbfstool/cbfs-mkpayload.c
View File

@ -433,7 +433,7 @@ int parse_fit_to_payload(const struct buffer *input, struct buffer *output,
*/ */
if (algo != CBFS_COMPRESS_NONE) { if (algo != CBFS_COMPRESS_NONE) {
ERROR("FIT images don't support whole-image compression," ERROR("FIT images don't support whole-image compression,"
" compress the kernel component instead!\n") " compress the kernel component instead!\n");
return -1; return -1;
} }

2
util/cbfstool/cbfs_image.c
View File

@ -399,7 +399,7 @@ int cbfs_copy_instance(struct cbfs_image *image, struct buffer *dst)
cbfs_calculate_file_header_size("") - sizeof(int32_t); cbfs_calculate_file_header_size("") - sizeof(int32_t);
if (last_entry_size < 0) if (last_entry_size < 0)
WARN("No room to create the last entry!\n") WARN("No room to create the last entry!\n");
else else
cbfs_create_empty_entry(dst_entry, CBFS_TYPE_NULL, cbfs_create_empty_entry(dst_entry, CBFS_TYPE_NULL,
last_entry_size, ""); last_entry_size, "");

14
util/cbfstool/console/console.h
View File

@ -8,15 +8,15 @@
/* Message output */ /* Message output */
extern int verbose; extern int verbose;
#define ERROR(...) { fprintf(stderr, "E: " __VA_ARGS__); } #define ERROR(...) fprintf(stderr, "E: " __VA_ARGS__)
#define WARN(...) { fprintf(stderr, "W: " __VA_ARGS__); } #define WARN(...) fprintf(stderr, "W: " __VA_ARGS__)
#define LOG(...) { fprintf(stderr, __VA_ARGS__); } #define LOG(...) fprintf(stderr, __VA_ARGS__)
#define INFO(...) { if (verbose > 0) fprintf(stderr, "INFO: " __VA_ARGS__); } #define INFO(...) do { if (verbose > 0) fprintf(stderr, "INFO: " __VA_ARGS__); } while (0)
#define DEBUG(...) { if (verbose > 1) fprintf(stderr, "DEBUG: " __VA_ARGS__); } #define DEBUG(...) do { if (verbose > 1) fprintf(stderr, "DEBUG: " __VA_ARGS__); } while (0)
#define printk(lvl, ...) \ #define printk(lvl, ...) \
{ \ do { \
if ((lvl) <= BIOS_ERR) { \ if ((lvl) <= BIOS_ERR) { \
ERROR(__VA_ARGS__); \ ERROR(__VA_ARGS__); \
} else if ((lvl) <= BIOS_NOTICE) { \ } else if ((lvl) <= BIOS_NOTICE) { \
@ -26,6 +26,6 @@ extern int verbose;
} else if ((lvl) <= BIOS_DEBUG) { \ } else if ((lvl) <= BIOS_DEBUG) { \
DEBUG(__VA_ARGS__); \ DEBUG(__VA_ARGS__); \
} \ } \
} } while (0)
#endif #endif