chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: rename load_path to fragment_path to make clear what kind of configuration...
[elogind.git]
/
load-fragment.c
diff --git
a/load-fragment.c
b/load-fragment.c
index 64e66f314ef44e576114cb9bccb5bffe82867ccd..4183b5c8fa912eec2ed5f412804c7eb6e1b29659 100644
(file)
--- a/
load-fragment.c
+++ b/
load-fragment.c
@@
-1207,8
+1207,8
@@
static int load_from_path(Unit *u, const char *path) {
}
}
- free(u->meta.
load
_path);
- u->meta.
load
_path = filename;
+ free(u->meta.
fragment
_path);
+ u->meta.
fragment
_path = filename;
filename = NULL;
r = 1; /* returning 1 means: suitable config file found and loaded */
filename = NULL;
r = 1; /* returning 1 means: suitable config file found and loaded */
@@
-1229,8
+1229,8
@@
int unit_load_fragment(Unit *u) {
assert(u);
assert(u->meta.load_state == UNIT_STUB);
assert(u);
assert(u->meta.load_state == UNIT_STUB);
- if (u->meta.
load
_path)
- r = load_from_path(u, u->meta.
load
_path);
+ if (u->meta.
fragment
_path)
+ r = load_from_path(u, u->meta.
fragment
_path);
else {
Iterator i;
char *t;
else {
Iterator i;
char *t;