Clean-up: common: rename local variables in PERROR

[lttng-tools.git] / tests / utils / utils.h

diff --git a/tests/utils/utils.h b/tests/utils/utils.h
index 48f937b1b71a9924b33d8201828421fc3a9b122d..afacf8d2f8cda641976aca064a6b52cf6c456fcd 100644 (file)
--- 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