mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 1/7] test: self: ramfs: fix unintended macro identifier confusion
Date: Mon, 22 May 2023 07:22:16 +0200	[thread overview]
Message-ID: <20230522052222.1037931-1-a.fatoum@pengutronix.de> (raw)

int ret = (_ret) is problematic, because when _ret is replaced with ret
in a macro, we end up with int ret = ret, which is valid syntactically,
but invokes undefined behavior. Guard against this by using different
identifiers.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 test/self/ramfs.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/self/ramfs.c b/test/self/ramfs.c
index f8e1d60a61b5..bce396dc171e 100644
--- a/test/self/ramfs.c
+++ b/test/self/ramfs.c
@@ -14,17 +14,17 @@
 
 BSELFTEST_GLOBALS();
 
-#define __expect(_ret, _cond, fmt, ...) ({ \
-	bool cond = (_cond); \
-	int ret = (_ret); \
+#define __expect(ret, cond, fmt, ...) ({ \
+	bool __cond = (cond); \
+	int __ret = (ret); \
 	total_tests++; \
 	\
-	if (!cond) { \
+	if (!__cond) { \
 		failed_tests++; \
 		printf("%s:%d error %pe: " fmt "\n", \
-		       __func__, __LINE__, ERR_PTR(ret), ##__VA_ARGS__); \
+		       __func__, __LINE__, ERR_PTR(__ret), ##__VA_ARGS__); \
 	} \
-	cond; \
+	__cond; \
 })
 
 #define expect_success(ret, ...) __expect((ret), (ret) >= 0, __VA_ARGS__)
-- 
2.39.2




             reply	other threads:[~2023-05-22  5:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-22  5:22 Ahmad Fatoum [this message]
2023-05-22  5:22 ` [PATCH master 2/7] include: zero_page: hide possibly NULL pointer variable from optimizer Ahmad Fatoum
2023-05-23  6:46   ` Ahmad Fatoum
2023-05-22  5:22 ` [PATCH master 3/7] ARM: configs: temporarily revive vexpress_defconfig Ahmad Fatoum
2023-05-22  8:23   ` Sascha Hauer
2023-05-22  8:36     ` Ahmad Fatoum
2023-05-22  5:22 ` [PATCH master 4/7] ARM64: configs: temporarily revive qemu_virt64_defconfig Ahmad Fatoum
2023-05-22  5:22 ` [PATCH master 5/7] pbl: have DEBUG_PBL depend only on PBL_CONSOLE Ahmad Fatoum
2023-05-22  5:22 ` [PATCH master 6/7] meminfo: avoid out-of-bounds compiler warning Ahmad Fatoum
2023-05-22  5:22 ` [PATCH master 7/7] console: don't fixup baud rate into earlycon string Ahmad Fatoum
2023-05-23  7:23 ` [PATCH master 1/7] test: self: ramfs: fix unintended macro identifier confusion Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230522052222.1037931-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox