From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 24 Mar 2021 21:03:46 +0000 (-0400)
Subject: fix: shadowed local variable in macros (-Wshadow)
X-Git-Tag: v2.13.0-rc1~182
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4041a8a71441f133654c4ca2a187748e08f03b22;p=lttng-ust.git

fix: shadowed local variable in macros (-Wshadow)

Add a prefix to the local variable names defined in the PERROR macro to
reduce the risk of shadowing variables with generic names.

Remove the local variable '____ptr_ret' in the shmp_index macro

Change-Id: I5d33e8eb4c760ffb527ac02cf8901105b500b28d
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 868a0d8b..50137617 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -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
diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 64507463..dab0b68d 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -64,12 +64,8 @@ char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
 	return &obj->memory_map[ref_offset];
 }
 
-#define shmp_index(handle, ref, index)					\
-	({								\
-		__typeof__((ref)._type) ____ptr_ret;			\
-		____ptr_ret = (__typeof__(____ptr_ret)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*____ptr_ret));	\
-		____ptr_ret;						\
-	})
+#define shmp_index(handle, ref, index)	\
+	((__typeof__((ref)._type)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*((ref)._type))))
 
 #define shmp(handle, ref)	shmp_index(handle, ref, 0)