chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: order remote mounts after both network.target and remote-fs-pre.target
[elogind.git]
/
src
/
load-fragment.c
diff --git
a/src/load-fragment.c
b/src/load-fragment.c
index c8b4b5a9c6f552024ac23febcab29ed9ff1b4c0b..12079c640fdefbeebca6bceb9752ab0494ae8968 100644
(file)
--- a/
src/load-fragment.c
+++ b/
src/load-fragment.c
@@
-554,6
+554,7
@@
int config_parse_exec(
if (!n[0]) {
log_error("[%s:%u] Invalid command line, ignoring: %s", filename, line, rvalue);
strv_free(n);
if (!n[0]) {
log_error("[%s:%u] Invalid command line, ignoring: %s", filename, line, rvalue);
strv_free(n);
+ free(path);
return 0;
}
return 0;
}
@@
-1545,10
+1546,12
@@
int config_parse_unit_condition_path(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if ((trigger = rvalue[0] == '|'))
+ trigger = rvalue[0] == '|';
+ if (trigger)
rvalue++;
rvalue++;
- if ((negate = rvalue[0] == '!'))
+ negate = rvalue[0] == '!';
+ if (negate)
rvalue++;
if (!path_is_absolute(rvalue)) {
rvalue++;
if (!path_is_absolute(rvalue)) {
@@
-1556,7
+1559,8
@@
int config_parse_unit_condition_path(
return 0;
}
return 0;
}
- if (!(c = condition_new(cond, rvalue, trigger, negate)))
+ c = condition_new(cond, rvalue, trigger, negate);
+ if (!c)
return -ENOMEM;
LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
return -ENOMEM;
LIST_PREPEND(Condition, conditions, u->meta.conditions, c);