diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-11-06 16:45:48 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-11-08 18:21:10 +0100 |
| commit | ee617a4e5ca5828cabd46f3bb1d9ffc0dd3db9e5 (patch) | |
| tree | 4c87c8db4af1a2bbe5678c3c965a33a90682dd41 /src/shared/main-func.h | |
| parent | meson: add version.h as dependency to more targets (diff) | |
| download | systemd-ee617a4e5ca5828cabd46f3bb1d9ffc0dd3db9e5.tar.xz systemd-ee617a4e5ca5828cabd46f3bb1d9ffc0dd3db9e5.zip | |
basic: move a bunch of cmdline-related funcs to new argv-util.c+h
I wanted to move saved_arg[cv] to process-util.c+h, but this causes problems:
process-util.h includes format-util.h which includes net/if.h, which conflicts
with linux/if.h. So we can't include process-util.h in some files.
But process-util.c is very long anyway, so it seems nice to create a new file.
rename_process(), invoked_as(), invoked_by_systemd(), and argv_looks_like_help()
which lived in process-util.c refer to saved_argc and saved_argv, so it seems
reasonable to move them to the new file too.
util.c is now empty, so it is removed. util.h remains.
Diffstat (limited to 'src/shared/main-func.h')
| -rw-r--r-- | src/shared/main-func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/main-func.h b/src/shared/main-func.h index 81a5c1813c..3dc4992282 100644 --- a/src/shared/main-func.h +++ b/src/shared/main-func.h @@ -5,12 +5,12 @@ #include "sd-daemon.h" +#include "argv-util.h" #include "pager.h" #include "selinux-util.h" #include "spawn-ask-password-agent.h" #include "spawn-polkit-agent.h" #include "static-destruct.h" -#include "util.h" #define _DEFINE_MAIN_FUNCTION(intro, impl, ret) \ int main(int argc, char *argv[]) { \ |