bus: add sd_bus_message_read_strv()
It will be useful to have that in the public API.
This commit is contained in:
committed by
Lennart Poettering
parent
b3451bed41
commit
4686d1b6ee
@@ -4486,7 +4486,7 @@ int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
|
||||
assert(l);
|
||||
|
||||
r = sd_bus_message_enter_container(m, 'a', "s");
|
||||
if (r < 0)
|
||||
if (r <= 0)
|
||||
return r;
|
||||
|
||||
for (;;) {
|
||||
@@ -4510,6 +4510,24 @@ int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sd_bus_message_read_strv(sd_bus_message *m, char ***l) {
|
||||
char **strv = NULL;
|
||||
int r;
|
||||
|
||||
assert_return(m, -EINVAL);
|
||||
assert_return(m->sealed, -EPERM);
|
||||
assert_return(l, -EINVAL);
|
||||
|
||||
r = bus_message_read_strv_extend(m, &strv);
|
||||
if (r <= 0) {
|
||||
strv_free(strv);
|
||||
return r;
|
||||
}
|
||||
|
||||
*l = strv;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const char* bus_message_get_arg(sd_bus_message *m, unsigned i) {
|
||||
int r;
|
||||
const char *t = NULL;
|
||||
|
||||
@@ -197,6 +197,7 @@ int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int all);
|
||||
int sd_bus_message_read(sd_bus_message *m, const char *types, ...);
|
||||
int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p);
|
||||
int sd_bus_message_read_array(sd_bus_message *m, char type, const void **ptr, size_t *size);
|
||||
int sd_bus_message_read_strv(sd_bus_message *m, char ***l);
|
||||
int sd_bus_message_skip(sd_bus_message *m, const char *types);
|
||||
int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents);
|
||||
int sd_bus_message_exit_container(sd_bus_message *m);
|
||||
|
||||
Reference in New Issue
Block a user