chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make bus errno mappings non-static
[elogind.git]
/
src
/
shared
/
path-lookup.c
diff --git
a/src/shared/path-lookup.c
b/src/shared/path-lookup.c
index 3a6e117d28c56702d365897868bea3e4134c3e34..8f75a8e83290db85540d544d82af45c4343e2852 100644
(file)
--- 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;
}
return 0;
}
-int user_runtime
(char **user_runtime_path
) {
+int user_runtime
_dir(char **runtime_dir
) {
const char *e;
char *r;
const char *e;
char *r;
@@
-71,7
+71,7
@@
int user_runtime(char **user_runtime_path) {
if (!r)
return -ENOMEM;
if (!r)
return -ENOMEM;
- *
user_runtime_path
= r;
+ *
runtime_dir
= r;
return 1;
}
return 1;
}
@@
-101,7
+101,7
@@
static char** user_dirs(
};
const char *home, *e;
};
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;
_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_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");
goto fail;
home = getenv("HOME");
@@
-162,18
+162,18
@@
static char** user_dirs(
if (strv_extend(&r, config_home) < 0)
goto fail;
if (strv_extend(&r, config_home) < 0)
goto fail;
- if (
user_runtime_dir
)
- if (strv_extend
(&r, user_runtime_dir
) < 0)
+ if (
!strv_isempty(config_dirs)
)
+ if (strv_extend
_strv_concat(&r, config_dirs, "/systemd/user"
) < 0)
goto fail;
goto fail;
- if (strv_extend
(&r, runtime_unit_path
) < 0)
+ if (strv_extend
_strv(&r, (char**) config_unit_paths
) < 0)
goto fail;
goto fail;
- if (
!strv_isempty(config_dirs)
)
- if (strv_extend
_strv_concat(&r, config_dirs, "/systemd/user"
) < 0)
+ if (
runtime_dir
)
+ if (strv_extend
(&r, runtime_dir
) < 0)
goto fail;
goto fail;
- if (strv_extend
_strv(&r, (char**) config_unit_paths
) < 0)
+ if (strv_extend
(&r, runtime_unit_path
) < 0)
goto fail;
if (generator)
goto fail;
if (generator)