Reduce warnings with -Wshadow=compatible-local builds

In a similar effort to f01592f91, here we further reduce the warnings we
get about local variables being shadowed when building with
-Wshadow=compatible-local.  This small change reduces the overall number
of warnings by 36.

Discussion: https://postgr.es/m/CAApHDvqBBqF=wmV5azrO7h3VwpwQo+JFBQ+g=E6wVUhKcqR8gA@mail.gmail.com

diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index b88d70b6fcc18959bd2970fa9e3abd730a35d45a..78dde9784983ea74ff2a80d43e30a28bb90f74af 100644 (file)
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -56,22 +56,22 @@
 
 #define EXPECT_EQ_U32(result_expr, expected_expr)      \
        do { \
-               uint32          result = (result_expr); \
-               uint32          expected = (expected_expr); \
-               if (result != expected) \
+               uint32          actual_result = (result_expr); \
+               uint32          expected_result = (expected_expr); \
+               if (actual_result != expected_result) \
                        elog(ERROR, \
                                 "%s yielded %u, expected %s in file \"%s\" line %u", \
-                                #result_expr, result, #expected_expr, __FILE__, __LINE__); \
+                                #result_expr, actual_result, #expected_expr, __FILE__, __LINE__); \
        } while (0)
 
 #define EXPECT_EQ_U64(result_expr, expected_expr)      \
        do { \
-               uint64          result = (result_expr); \
-               uint64          expected = (expected_expr); \
-               if (result != expected) \
+               uint64          actual_result = (result_expr); \
+               uint64          expected_result = (expected_expr); \
+               if (actual_result != expected_result) \
                        elog(ERROR, \
                                 "%s yielded " UINT64_FORMAT ", expected %s in file \"%s\" line %u", \
-                                #result_expr, result, #expected_expr, __FILE__, __LINE__); \
+                                #result_expr, actual_result, #expected_expr, __FILE__, __LINE__); \
        } while (0)
 
 #define LDELIM                 '('