diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-04-08 11:20:10 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 07:53:04 +0100 |
| commit | e5bb612acc3018bcbe86ceee7975baaab8380191 (patch) | |
| tree | 8821715704abe5598a8b537bc1925b9043a66bf3 /src/libelogind/sd-bus/bus-message.c | |
| parent | 999463d14994808ff15fc4dd66c540d8a29f8121 (diff) | |
bus: simplify bus_message_read_strv_extend()
Avoid unbound for(;;) loop and use the established coding-style:
while ((r = sd_bus_message_read*(...)) > 0) {
}
if (r < 0)
return r;
This is much easier to read and used all over the code base.
Diffstat (limited to 'src/libelogind/sd-bus/bus-message.c')
| -rw-r--r-- | src/libelogind/sd-bus/bus-message.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c index 70c38cf48..6ee209dd1 100644 --- a/src/libelogind/sd-bus/bus-message.c +++ b/src/libelogind/sd-bus/bus-message.c @@ -5550,6 +5550,7 @@ int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) { } int bus_message_read_strv_extend(sd_bus_message *m, char ***l) { + const char *s; int r; assert(m); @@ -5559,19 +5560,13 @@ int bus_message_read_strv_extend(sd_bus_message *m, char ***l) { if (r <= 0) return r; - for (;;) { - const char *s; - - r = sd_bus_message_read_basic(m, 's', &s); - if (r < 0) - return r; - if (r == 0) - break; - + while ((r = sd_bus_message_read_basic(m, 's', &s)) > 0) { r = strv_extend(l, s); if (r < 0) return r; } + if (r < 0) + return r; r = sd_bus_message_exit_container(m); if (r < 0) |