shared/exec-util: minor rearrangement, drop unused EXEC_DIR_NONE

2024-10-15 01:16:57 +02:00
parent e472238525
commit 8e39ba3e5a
3 changed files with 21 additions and 20 deletions
@@ -438,6 +438,12 @@ static int gather_environment_consume(int fd, void *arg) {
        return r;
 }

+const gather_stdout_callback_t gather_environment[_STDOUT_CONSUME_MAX] = {
+        gather_environment_generate,
+        gather_environment_collect,
+        gather_environment_consume,
+};
+
 int exec_command_flags_from_strv(char * const *ex_opts, ExecCommandFlags *ret) {
        ExecCommandFlags flags = 0;

@@ -478,12 +484,6 @@ int exec_command_flags_to_strv(ExecCommandFlags flags, char ***ret) {
        return 0;
 }

-const gather_stdout_callback_t gather_environment[] = {
-        gather_environment_generate,
-        gather_environment_collect,
-        gather_environment_consume,
-};
-
 static const char* const exec_command_strings[] = {
        "ignore-failure", /* EXEC_COMMAND_IGNORE_FAILURE */
        "privileged",     /* EXEC_COMMAND_FULLY_PRIVILEGED */