diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-02 08:01:00 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-02 11:10:35 -0400 |
| commit | 4d5dec2389d8e6ce78b45d3058220888f4a93db7 (patch) | |
| tree | 2daa47ef3e9ac18f04b2cd8557942cdfe6949b91 /src/shared/path-lookup.c | |
| parent | 718880ba0d557a045e2f969e141cbd59e78c76f4 (diff) | |
Rename user_runtime to user_runtime_dir
This makes this function name similar to user_config_home() and makes
it match the name of the environment variable.
Diffstat (limited to 'src/shared/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 3a6e117d28..d7ed6e9e3c 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -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) |