picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conf-parse: use strjoina() where appropriate

This commit is contained in:
Lennart Poettering 2018-11-16 18:08:29 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 46f2d09f31
commit 4472fa6d2c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/shared/conf-parser.c
View File

@ -82,19 +82,13 @@ int config_item_perf_lookup(
assert(ltype);
assert(data);
if (!section)
p = lookup(lvalue, strlen(lvalue));
else {
char *key;
key = strjoin(section, ".", lvalue);
if (!key)
return -ENOMEM;
if (section) {
const char *key;
key = strjoina(section, ".", lvalue);
p = lookup(key, strlen(key));
free(key);
}
} else
p = lookup(lvalue, strlen(lvalue));
if (!p)
return 0;
@ -132,7 +126,6 @@ static int next_assignment(
r = lookup(table, section, lvalue, &func, &ltype, &data, userdata);
if (r < 0)
return r;
if (r > 0) {
if (func)
return func(unit, filename, line, section, section_line,