From 1a735f9b22d474ef4f9826bb0465d3fd24293ab7 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 8 Dec 2021 10:07:08 +0100 Subject: test-exec-util: rename variable to avoid global/local name conflict --- src/test/test-exec-util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/test/test-exec-util.c') diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index 94ef6e8bbf..47a82eb969 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); -- cgit v1.2.3