picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

path_lookup: moved _cleanup_lookup_paths_free_ from install.c to path-lookup.h

Browse source
This commit is contained in:
Daniel Buch 2013-10-27 12:45:52 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent a501033335
commit fb15be8395
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/shared/install.c
View file

@ -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) {

2
src/shared/path-lookup.h
View file

@ -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_;

4
src/systemctl/systemctl.c
View file

@ -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++) {