X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fload-fragment.c;h=c6422619f5d008db5dcd104c1347a88340d635f1;hb=c53158818d8cdaf46b3f1b5299b9bda118a1043f;hp=10681307cfc2fe3d7d628a2f6dca6aa3faae590c;hpb=9ed63f16131637fc0e76bd40b5452cfc45bccfc7;p=elogind.git diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 10681307c..c6422619f 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1516,14 +1516,17 @@ int config_parse_unit_condition_string( assert(rvalue); assert(data); - if ((trigger = rvalue[0] == '|')) + trigger = rvalue[0] == '|'; + if (trigger) rvalue++; - if ((negate = rvalue[0] == '!')) + negate = rvalue[0] == '!'; + if (negate) rvalue++; - if (!(c = condition_new(cond, rvalue, trigger, negate))) - return -ENOMEM; + c = condition_new(cond, rvalue, trigger, negate); + if (!c) + return log_oom(); LIST_PREPEND(Condition, conditions, u->conditions, c); return 0; @@ -2028,7 +2031,7 @@ int config_parse_syscall_filter( ExecContext *c = data; Unit *u = userdata; - bool invert; + bool invert = false; char *w; size_t l; char *state;