chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: avoid trailing whitespace in feature string
[elogind.git]
/
src
/
core
/
load-fragment.c
diff --git
a/src/core/load-fragment.c
b/src/core/load-fragment.c
index 6b6f9908b58ddd8294a68fa796ec024eb228d302..2ee16bdef9e005782df4b2b729e79eef33d3afa3 100644
(file)
--- a/
src/core/load-fragment.c
+++ b/
src/core/load-fragment.c
@@
-1366,8
+1366,7
@@
int config_parse_timer(const char *unit,
v = new0(TimerValue, 1);
if (!v) {
v = new0(TimerValue, 1);
if (!v) {
- if (c)
- calendar_spec_free(c);
+ calendar_spec_free(c);
return log_oom();
}
return log_oom();
}
@@
-1956,22
+1955,23
@@
int config_parse_ip_tos(const char *unit,
return 0;
}
return 0;
}
-int config_parse_unit_condition_path(const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+int config_parse_unit_condition_path(
+ const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
- ConditionType cond = ltype;
- Unit *u = data;
- bool trigger, negate;
- Condition *c;
_cleanup_free_ char *p = NULL;
_cleanup_free_ char *p = NULL;
+ Condition **list = data, *c;
+ ConditionType t = ltype;
+ bool trigger, negate;
+ Unit *u = userdata;
int r;
assert(filename);
int r;
assert(filename);
@@
-1981,8
+1981,8
@@
int config_parse_unit_condition_path(const char *unit,
if (isempty(rvalue)) {
/* Empty assignment resets the list */
if (isempty(rvalue)) {
/* Empty assignment resets the list */
- condition_free_list(
u->conditions
);
-
u->conditions
= NULL;
+ condition_free_list(
*list
);
+
*list
= NULL;
return 0;
}
return 0;
}
@@
-1995,45
+1995,41
@@
int config_parse_unit_condition_path(const char *unit,
rvalue++;
r = unit_full_printf(u, rvalue, &p);
rvalue++;
r = unit_full_printf(u, rvalue, &p);
- if (r < 0)
- log_syntax(unit, LOG_ERR, filename, line, -r,
- "Failed to resolve specifiers, ignoring: %s", rvalue);
- if (!p) {
- p = strdup(rvalue);
- if (!p)
- return log_oom();
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to resolve specifiers, ignoring: %s", rvalue);
+ return 0;
}
if (!path_is_absolute(p)) {
}
if (!path_is_absolute(p)) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Path in condition not absolute, ignoring: %s", p);
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Path in condition not absolute, ignoring: %s", p);
return 0;
}
return 0;
}
- c = condition_new(
cond
, p, trigger, negate);
+ c = condition_new(
t
, p, trigger, negate);
if (!c)
return log_oom();
if (!c)
return log_oom();
- LIST_PREPEND(conditions,
u->conditions
, c);
+ LIST_PREPEND(conditions,
*list
, c);
return 0;
}
return 0;
}
-int config_parse_unit_condition_string(const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+int config_parse_unit_condition_string(
+ const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
- ConditionType cond = ltype;
- Unit *u = data;
- bool trigger, negate;
- Condition *c;
_cleanup_free_ char *s = NULL;
_cleanup_free_ char *s = NULL;
+ Condition **list = data, *c;
+ ConditionType t = ltype;
+ bool trigger, negate;
+ Unit *u = userdata;
int r;
assert(filename);
int r;
assert(filename);
@@
-2043,8
+2039,8
@@
int config_parse_unit_condition_string(const char *unit,
if (isempty(rvalue)) {
/* Empty assignment resets the list */
if (isempty(rvalue)) {
/* Empty assignment resets the list */
- condition_free_list(
u->conditions
);
-
u->conditions
= NULL;
+ condition_free_list(
*list
);
+
*list
= NULL;
return 0;
}
return 0;
}
@@
-2057,36
+2053,32
@@
int config_parse_unit_condition_string(const char *unit,
rvalue++;
r = unit_full_printf(u, rvalue, &s);
rvalue++;
r = unit_full_printf(u, rvalue, &s);
- if (r < 0)
- log_syntax(unit, LOG_ERR, filename, line, -r,
- "Failed to resolve specifiers, ignoring: %s", rvalue);
- if (!s) {
- s = strdup(rvalue);
- if (!s)
- return log_oom();
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to resolve specifiers, ignoring: %s", rvalue);
+ return 0;
}
}
- c = condition_new(
cond
, s, trigger, negate);
+ c = condition_new(
t
, s, trigger, negate);
if (!c)
return log_oom();
if (!c)
return log_oom();
- LIST_PREPEND(conditions,
u->conditions
, c);
+ LIST_PREPEND(conditions,
*list
, c);
return 0;
}
return 0;
}
-int config_parse_unit_condition_null(const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+int config_parse_unit_condition_null(
+ const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
- Unit *u = data;
- Condition *c;
+ Condition **list = data, *c;
bool trigger, negate;
int b;
bool trigger, negate;
int b;
@@
-2097,8
+2089,8
@@
int config_parse_unit_condition_null(const char *unit,
if (isempty(rvalue)) {
/* Empty assignment resets the list */
if (isempty(rvalue)) {
/* Empty assignment resets the list */
- condition_free_list(
u->conditions
);
-
u->conditions
= NULL;
+ condition_free_list(
*list
);
+
*list
= NULL;
return 0;
}
return 0;
}
@@
-2112,9
+2104,7
@@
int config_parse_unit_condition_null(const char *unit,
b = parse_boolean(rvalue);
if (b < 0) {
b = parse_boolean(rvalue);
if (b < 0) {
- log_syntax(unit, LOG_ERR, filename, line, -b,
- "Failed to parse boolean value in condition, ignoring: %s",
- rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, -b, "Failed to parse boolean value in condition, ignoring: %s", rvalue);
return 0;
}
return 0;
}
@@
-2125,7
+2115,7
@@
int config_parse_unit_condition_null(const char *unit,
if (!c)
return log_oom();
if (!c)
return log_oom();
- LIST_PREPEND(conditions,
u->conditions
, c);
+ LIST_PREPEND(conditions,
*list
, c);
return 0;
}
return 0;
}