Now that strv_extend() is not so slow anymore, we can make use of it, to
shorten our code a bit.
int r = 0;
char **ret = NULL;
int r = 0;
char **ret = NULL;
assert(bus);
assert(name);
assert(bus);
assert(name);
assert(dbus_message_iter_get_arg_type(&sub4) == DBUS_TYPE_STRING);
dbus_message_iter_get_basic(&sub4, &s);
assert(dbus_message_iter_get_arg_type(&sub4) == DBUS_TYPE_STRING);
dbus_message_iter_get_basic(&sub4, &s);
- c = strv_append(ret, s);
- if (c == NULL) {
- r = log_oom();
+
+ r = strv_extend(&ret, s);
+ if (r < 0) {
+ log_oom();
- strv_free(ret);
- ret = c;
dbus_message_iter_next(&sub4);
}
}
dbus_message_iter_next(&sub4);
}
}