shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

Rename user_runtime to user_runtime_dir

Browse Source 
This makes this function name similar to user_config_home() and makes
it match the name of the environment variable.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-10-02 08:01:00 -04:00
parent 718880ba0d
commit 4d5dec2389
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/unit.c
View File

@ -3083,7 +3083,7 @@ static int unit_drop_in_dir(Unit *u, UnitSetPropertiesMode mode, bool transient,
if (mode == UNIT_PERSISTENT && !transient)
r = user_config_home(dir);
else
r = user_runtime(dir);
r = user_runtime_dir(dir);
if (r == 0)
return -ENOENT;
@ -3232,7 +3232,7 @@ int unit_make_transient(Unit *u) {
if (u->manager->running_as == SYSTEMD_USER) {
_cleanup_free_ char *c = NULL;
r = user_runtime(&c);
r = user_runtime_dir(&c);
if (r < 0)
return r;
if (r == 0)

2
src/shared/install.c
View File

@ -109,7 +109,7 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d
return -EINVAL;
if (runtime)
r = user_runtime(&p);
r = user_runtime_dir(&p);
else
r = user_config_home(&p);

12
src/shared/path-lookup.c
View File

@ -61,7 +61,7 @@ int user_config_home(char **config_home) {
return 0;
}
int user_runtime(char **user_runtime_path) {
int user_runtime_dir(char **runtime_dir) {
const char *e;
char *r;
@ -71,7 +71,7 @@ int user_runtime(char **user_runtime_path) {
if (!r)
return -ENOMEM;
*user_runtime_path = r;
*runtime_dir = r;
return 1;
}
@ -101,7 +101,7 @@ static char** user_dirs(
};
const char *home, *e;
_cleanup_free_ char *config_home = NULL, *user_runtime_dir = NULL, *data_home = NULL;
_cleanup_free_ char *config_home = NULL, *runtime_dir = NULL, *data_home = NULL;
_cleanup_strv_free_ char **config_dirs = NULL, **data_dirs = NULL;
char **r = NULL;
@ -117,7 +117,7 @@ static char** user_dirs(
if (user_config_home(&config_home) < 0)
goto fail;
if (user_runtime(&user_runtime_dir) < 0)
if (user_runtime_dir(&runtime_dir) < 0)
goto fail;
home = getenv("HOME");
@ -162,8 +162,8 @@ static char** user_dirs(
if (strv_extend(&r, config_home) < 0)
goto fail;
if (user_runtime_dir)
if (strv_extend(&r, user_runtime_dir) < 0)
if (runtime_dir)
if (strv_extend(&r, runtime_dir) < 0)
goto fail;
if (strv_extend(&r, runtime_unit_path) < 0)

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

@ -39,7 +39,7 @@ typedef enum SystemdRunningAs {
} SystemdRunningAs;
int user_config_home(char **config_home);
int user_runtime(char **user_runtime_path);
int user_runtime_dir(char **runtime_dir);
int lookup_paths_init(LookupPaths *p,
SystemdRunningAs running_as,