X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.h;h=afacf8d2f8cda641976aca064a6b52cf6c456fcd;hp=48f937b1b71a9924b33d8201828421fc3a9b122d;hb=0c818c97b35a36971c326171d9aea5b0a432ced9;hpb=9de37b2bb179ef4bc729ab3abc3c47400012a960

diff --git a/tests/utils/utils.h b/tests/utils/utils.h
index 48f937b1b..afacf8d2f 100644
--- a/tests/utils/utils.h
+++ b/tests/utils/utils.h
@@ -13,22 +13,23 @@
 /*
  * Version using XSI strerror_r.
  */
-#define PERROR_NO_LOGGER(msg, args...)                      \
-	do {                                                \
-		char buf[200];                              \
-		strerror_r(errno, buf, sizeof(buf));        \
-		fprintf(stderr, msg ": %s\n", ##args, buf); \
+#define PERROR_NO_LOGGER(msg, args...)                               \
+	do {                                                         \
+		char _perror_buf[200];                               \
+		strerror_r(errno, _perror_buf, sizeof(_perror_buf)); \
+		fprintf(stderr, msg ": %s\n", ##args, _perror_buf);  \
 	} while (0);
 #else
 /*
  * Version using GNU strerror_r, for linux with appropriate defines.
  */
-#define PERROR_NO_LOGGER(msg, args...)                      \
-	do {                                                \
-		char *buf;                                  \
-		char tmp[200];                              \
-		buf = strerror_r(errno, tmp, sizeof(tmp));  \
-		fprintf(stderr, msg ": %s\n", ##args, buf); \
+#define PERROR_NO_LOGGER(msg, args...)                                    \
+	do {                                                              \
+		char *_perror_buf;                                        \
+		char _perror_tmp[200];                                    \
+		_perror_buf = strerror_r(                                 \
+				errno, _perror_tmp, sizeof(_perror_tmp)); \
+		fprintf(stderr, msg ": %s\n", ##args, _perror_buf);       \
 	} while (0);
 #endif