commit 9049dfdb6895739c3ea1b110e41548a9677194d4
author Fred Reitberger <reitbergerfred@gmail.com> Wed Oct 12 10:47:39 2022 -0400
committer Felix Held <felix-coreboot@felixheld.de> Thu Oct 13 17:07:02 2022 +0000
tree bafc8ae15164af78711a7ec40d9dc22e354f33f6
parent a261502de5cef79e676c69824212950d27332081

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>

util/cbfstool/cbfs-mkpayload.c

diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index e1a3272..63c81a3 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -433,7 +433,7 @@
 	 */
 	if (algo != CBFS_COMPRESS_NONE) {
 		ERROR("FIT images don't support whole-image compression,"
-		      " compress the kernel component instead!\n")
+		      " compress the kernel component instead!\n");
 		return -1;
 	}
 

util/cbfstool/cbfs_image.c

diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 182b185..683a96c 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -399,7 +399,7 @@
 		cbfs_calculate_file_header_size("") - sizeof(int32_t);
 
 	if (last_entry_size < 0)
-		WARN("No room to create the last entry!\n")
+		WARN("No room to create the last entry!\n");
 	else
 		cbfs_create_empty_entry(dst_entry, CBFS_TYPE_NULL,
 			last_entry_size, "");

util/cbfstool/console/console.h

diff --git a/util/cbfstool/console/console.h b/util/cbfstool/console/console.h
index 0595bea..b25589a 100644
--- a/util/cbfstool/console/console.h
+++ b/util/cbfstool/console/console.h
@@ -8,15 +8,15 @@
 
 /* Message output */
 extern int verbose;
-#define ERROR(...) { fprintf(stderr, "E: " __VA_ARGS__); }
-#define WARN(...) { fprintf(stderr, "W: " __VA_ARGS__); }
-#define LOG(...) { fprintf(stderr, __VA_ARGS__); }
-#define INFO(...) { if (verbose > 0) fprintf(stderr, "INFO: " __VA_ARGS__); }
-#define DEBUG(...) { if (verbose > 1) fprintf(stderr, "DEBUG: " __VA_ARGS__); }
+#define ERROR(...) fprintf(stderr, "E: " __VA_ARGS__)
+#define WARN(...) fprintf(stderr, "W: " __VA_ARGS__)
+#define LOG(...) fprintf(stderr, __VA_ARGS__)
+#define INFO(...) do { if (verbose > 0) fprintf(stderr, "INFO: " __VA_ARGS__); } while (0)
+#define DEBUG(...) do { if (verbose > 1) fprintf(stderr, "DEBUG: " __VA_ARGS__); } while (0)
 
 
 #define printk(lvl, ...) \
-	{						\
+	do {						\
 		if ((lvl) <= BIOS_ERR) {		\
 			ERROR(__VA_ARGS__);		\
 		} else if ((lvl) <= BIOS_NOTICE) {	\
@@ -26,6 +26,6 @@
 		} else if ((lvl) <= BIOS_DEBUG) {	\
 			DEBUG(__VA_ARGS__);		\
 		}					\
-	}
+	} while (0)
 
 #endif