X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fusterr-signal-safe.h;h=6123c0b3a54bed820f36fbc74d93a1fed661646f;hb=1d18d519668cd559dcafa1f18113edceb2418ed0;hp=868a0d8b81257d186cd5a788e40c1891058c52b7;hpb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;p=lttng-ust.git

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 868a0d8b..6123c0b3 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -24,11 +24,11 @@ enum ust_err_loglevel {
 	UST_ERR_LOGLEVEL_DEBUG,
 };
 
-__attribute__((visibility("hidden")))
-extern volatile enum ust_err_loglevel ust_err_loglevel;
+extern volatile enum ust_err_loglevel ust_err_loglevel
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-void ust_err_init(void);
+void ust_err_init(void)
+	__attribute__((visibility("hidden")));
 
 #ifdef LTTNG_UST_DEBUG
 static inline bool ust_err_debug_enabled(void)
@@ -100,9 +100,11 @@ do {									\
 #define PERROR(call, args...)						\
 	do {								\
 		if (ust_err_debug_enabled()) {				\
-			char buf[200] = "Error in strerror_r()";	\
-			strerror_r(errno, buf, sizeof(buf));		\
-			ERRMSG("Error: " call ": %s", ## args, buf);	\
+			char perror_buf[200] = "Error in strerror_r()";	\
+			strerror_r(errno, perror_buf,			\
+					sizeof(perror_buf));		\
+			ERRMSG("Error: " call ": %s", ## args, 		\
+					perror_buf);			\
 		}							\
 	} while(0)
 #else
@@ -112,10 +114,12 @@ do {									\
 #define PERROR(call, args...)						\
 	do {								\
 		if (ust_err_debug_enabled()) {				\
-			char *buf;					\
-			char tmp[200];					\
-			buf = strerror_r(errno, tmp, sizeof(tmp));	\
-			ERRMSG("Error: " call ": %s", ## args, buf);	\
+			char *perror_buf;				\
+			char perror_tmp[200];				\
+			perror_buf = strerror_r(errno, perror_tmp,	\
+					sizeof(perror_tmp));		\
+			ERRMSG("Error: " call ": %s", ## args,		\
+					perror_buf);			\
 		}							\
 	} while(0)
 #endif