summaryrefslogtreecommitdiffstats
path: root/src/test/test-exec-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-12-08 10:07:08 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-12-08 10:13:50 +0100
commit1a735f9b22d474ef4f9826bb0465d3fd24293ab7 (patch)
tree180cadfe796144b05945b5db095664c0b4c5e08d /src/test/test-exec-util.c
parenttest-dhcp-option: rename variable to avoid global/local name conflict (diff)
downloadsystemd-1a735f9b22d474ef4f9826bb0465d3fd24293ab7.tar.xz
systemd-1a735f9b22d474ef4f9826bb0465d3fd24293ab7.zip
test-exec-util: rename variable to avoid global/local name conflict
Diffstat (limited to 'src/test/test-exec-util.c')
-rw-r--r--src/test/test-exec-util.c5
1 files changed, 3 insertions, 2 deletions
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);