From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 8 Dec 2021 09:07:08 +0000 (+0100)
Subject: test-exec-util: rename variable to avoid global/local name conflict
X-Git-Tag: v250-rc1~23^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a735f9b22d474ef4f9826bb0465d3fd24293ab7;p=thirdparty%2Fsystemd.git

test-exec-util: rename variable to avoid global/local name conflict
---

diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index 94ef6e8bbff..47a82eb969c 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -236,7 +236,7 @@ static int gather_stdout_three(int fd, void *arg) {
         return 0;
 }
 
-const gather_stdout_callback_t gather_stdout[] = {
+const gather_stdout_callback_t gather_stdouts[] = {
         gather_stdout_one,
         gather_stdout_two,
         gather_stdout_three,
@@ -277,7 +277,8 @@ TEST(stdout_gathering) {
         if (access(name, X_OK) < 0 && ERRNO_IS_PRIVILEGE(errno))
                 return;
 
-        r = execute_directories(dirs, DEFAULT_TIMEOUT_USEC, gather_stdout, args, NULL, NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS);
+        r = execute_directories(dirs, DEFAULT_TIMEOUT_USEC, gather_stdouts, args, NULL, NULL,
+                                EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS);
         assert_se(r >= 0);
 
         log_info("got: %s", output);