if (s->published == UNPUBLISHED) {
/* Remove this service */
- if (s->entry_group) {
+ if (s->entry_group)
avahi_entry_group_free(s->entry_group);
- }
pa_hashmap_remove(u->services, s->name);
pa_xfree(s->name);
static int publish_sink(struct userdata *u, pa_sink *s) {
struct service *svc;
+ int ret;
assert(u && s);
svc = get_service(u, s->name);
svc->loaded.type = PA_NAMEREG_SINK;
svc->loaded.index = s->index;
- pa_dynarray_put(u->sink_dynarray, s->index, svc);
+ if ((ret = publish_service(u, svc)) < 0)
+ return ret;
- return publish_service(u, svc);
+ pa_dynarray_put(u->sink_dynarray, s->index, svc);
+ return ret;
}
static int publish_source(struct userdata *u, pa_source *s) {
struct service *svc;
+ int ret;
+
assert(u && s);
svc = get_service(u, s->name);
pa_dynarray_put(u->source_dynarray, s->index, svc);
- return publish_service(u, svc);
+ if ((ret = publish_service(u, svc)) < 0)
+ return ret;
+
+ pa_dynarray_put(u->sink_dynarray, s->index, svc);
+ return ret;
}
static int publish_autoload(struct userdata *u, pa_autoload_entry *s) {
struct service *svc;
+ int ret;
+
assert(u && s);
svc = get_service(u, s->name);
svc->autoload.type = s->type;
svc->autoload.index = s->index;
- pa_dynarray_put(u->autoload_dynarray, s->index, svc);
+ if ((ret = publish_service(u, svc)) < 0)
+ return ret;
- return publish_service(u, svc);
+ pa_dynarray_put(u->autoload_dynarray, s->index, svc);
+ return ret;
}
static int remove_sink(struct userdata *u, uint32_t idx) {
if (u->services)
pa_hashmap_free(u->services, service_free, u);
+ if (u->subscription)
+ pa_subscription_free(u->subscription);
+
if (u->sink_dynarray)
pa_dynarray_free(u->sink_dynarray, NULL, NULL);
if (u->source_dynarray)
if (u->autoload_dynarray)
pa_dynarray_free(u->autoload_dynarray, NULL, NULL);
- if (u->subscription)
- pa_subscription_free(u->subscription);
if (u->main_entry_group)
avahi_entry_group_free(u->main_entry_group);