diff options
| author | Daniel Buch <boogiewasthere@gmail.com> | 2013-10-27 12:45:52 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-27 11:51:22 -0400 |
| commit | fb15be839500c39f6c2f006f45306d439e1a7add (patch) | |
| tree | e95c243d6316ab5c728ff3bd8db68db2f65eb54a /src | |
| parent | a501033335ed402c8f7e86fe41a15531ba69abd7 (diff) | |
| download | systemd-fb15be839500c39f6c2f006f45306d439e1a7add.tar.gz | |
path_lookup: moved _cleanup_lookup_paths_free_ from install.c to path-lookup.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/install.c | 1 | ||||
| -rw-r--r-- | src/shared/path-lookup.h | 2 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 3bced1a5ee..987b36d40b 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -44,7 +44,6 @@ typedef struct { Hashmap *have_installed; } InstallContext; -#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free) #define _cleanup_install_context_done_ _cleanup_(install_context_done) static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) { diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 9dee85f967..a3ef824a86 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -36,6 +36,8 @@ typedef enum SystemdRunningAs { _SYSTEMD_RUNNING_AS_INVALID = -1 } SystemdRunningAs; +#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free) + const char* systemd_running_as_to_string(SystemdRunningAs i) _const_; SystemdRunningAs systemd_running_as_from_string(const char *s) _pure_; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index d458c6588d..87a6985cc9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4223,7 +4223,7 @@ static int enable_sysv_units(const char *verb, char **args) { #if defined(HAVE_SYSV_COMPAT) && defined(HAVE_CHKCONFIG) unsigned f = 1, t = 1; - LookupPaths paths = {}; + _cleanup_lookup_paths_free_ LookupPaths paths = {}; if (arg_scope != UNIT_FILE_SYSTEM) return 0; @@ -4361,8 +4361,6 @@ static int enable_sysv_units(const char *verb, char **args) { } finish: - lookup_paths_free(&paths); - /* Drop all SysV units */ for (f = 0, t = 0; args[f]; f++) { |