mirror of
https://github.com/systemd/systemd.git
synced 2025-03-28 02:50:16 +03:00
bus-unit-util: add missing assertions
This commit is contained in:
parent
0fa062f983
commit
85f759baee
@ -148,9 +148,11 @@ static int bus_append_string(sd_bus_message *m, const char *field, const char *e
|
||||
}
|
||||
|
||||
static int bus_append_strv(sd_bus_message *m, const char *field, const char *eq, const char *separator, ExtractFlags flags) {
|
||||
const char *p;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(field);
|
||||
|
||||
r = sd_bus_message_open_container(m, 'r', "sv");
|
||||
if (r < 0)
|
||||
return bus_log_create_error(r);
|
||||
@ -167,16 +169,16 @@ static int bus_append_strv(sd_bus_message *m, const char *field, const char *eq,
|
||||
if (r < 0)
|
||||
return bus_log_create_error(r);
|
||||
|
||||
for (p = eq;;) {
|
||||
for (const char *p = eq;;) {
|
||||
_cleanup_free_ char *word = NULL;
|
||||
|
||||
r = extract_first_word(&p, &word, separator, flags);
|
||||
if (r == 0)
|
||||
break;
|
||||
if (r == -ENOMEM)
|
||||
return log_oom();
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Invalid syntax: %s", eq);
|
||||
if (r == 0)
|
||||
break;
|
||||
|
||||
r = sd_bus_message_append_basic(m, 's', word);
|
||||
if (r < 0)
|
||||
|
Loading…
x
Reference in New Issue
Block a user