From d31c057b4296bbfad491f55a4487d532750a6dea Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 May 2020 15:15:14 +0200 Subject: [PATCH] Remove some useless checks --- src/examples/media-session/media-session.c | 4 +--- src/examples/media-session/reserve.c | 3 --- src/pipewire/filter.c | 5 +---- src/pipewire/thread-loop.c | 2 +- src/tools/pw-cli.c | 4 ---- src/tools/pw-dot.c | 8 ++++---- 6 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index f27fc849d..578d17bed 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -1043,9 +1043,7 @@ static struct sm_object *init_object(struct impl *impl, const struct object_info pw_proxy_add_object_listener(obj->proxy, &obj->object_listener, info->events, obj); SPA_FLAG_UPDATE(obj->mask, SM_OBJECT_CHANGE_MASK_LISTENER, info->events != NULL); } - if (handle) { - pw_proxy_add_listener(obj->handle, &obj->handle_listener, &proxy_events, obj); - } + pw_proxy_add_listener(obj->handle, &obj->handle_listener, &proxy_events, obj); if (info->init) info->init(obj); diff --git a/src/examples/media-session/reserve.c b/src/examples/media-session/reserve.c index 92ba40490..09cbe531c 100644 --- a/src/examples/media-session/reserve.c +++ b/src/examples/media-session/reserve.c @@ -214,9 +214,6 @@ static DBusHandlerResult object_handler(DBusConnection *c, DBusMessage *m, void return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; invalid: - if (reply) - dbus_message_unref(reply); - if (!(reply = dbus_message_new_error(m, DBUS_ERROR_INVALID_ARGS, "Invalid arguments"))) diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c index fa368dc61..8e467b3ff 100644 --- a/src/pipewire/filter.c +++ b/src/pipewire/filter.c @@ -633,10 +633,7 @@ static int impl_port_set_param(void *object, if (filter->state == PW_FILTER_STATE_ERROR) return -EIO; - if (port) - emit_port_info(impl, port, false); - else - emit_node_info(impl, false); + emit_port_info(impl, port, false); return res; } diff --git a/src/pipewire/thread-loop.c b/src/pipewire/thread-loop.c index 36b05ffba..d09a7a47b 100644 --- a/src/pipewire/thread-loop.c +++ b/src/pipewire/thread-loop.c @@ -199,7 +199,7 @@ void pw_thread_loop_destroy(struct pw_thread_loop *loop) pw_loop_destroy_source(loop->loop, loop->event); - if (loop->created && loop->loop) + if (loop->created) pw_loop_destroy(loop->loop); pthread_cond_destroy(&loop->accept_cond); diff --git a/src/tools/pw-cli.c b/src/tools/pw-cli.c index 8f6e77c32..09a47b69a 100644 --- a/src/tools/pw-cli.c +++ b/src/tools/pw-cli.c @@ -1777,10 +1777,6 @@ children_of(struct remote_data *rd, uint32_t parent_id, } } - - if (!count) - return 0; - return count; } diff --git a/src/tools/pw-dot.c b/src/tools/pw-dot.c index 04cd075fd..a4184fa85 100644 --- a/src/tools/pw-dot.c +++ b/src/tools/pw-dot.c @@ -246,7 +246,7 @@ static void draw_node(struct global *g) struct global *p; const char *prop_node_id; spa_list_for_each(p, &g->data->globals, link) { - if (p == NULL || p->info == NULL) + if (p->info == NULL) continue; if (p->type != INTERFACE_Port) continue; @@ -407,7 +407,7 @@ static bool is_node_id_link_referenced(uint32_t id, struct spa_list *globals) struct global *g; struct pw_link_info *info; spa_list_for_each(g, globals, link) { - if (g == NULL || g->info == NULL) + if (g->info == NULL) continue; if (g->type != INTERFACE_Link) continue; @@ -424,7 +424,7 @@ static bool is_module_id_factory_referenced(uint32_t id, struct spa_list *global struct pw_factory_info *info; const char *module_id_str; spa_list_for_each(g, globals, link) { - if (g == NULL || g->info == NULL) + if (g->info == NULL) continue; if (g->type != INTERFACE_Factory) continue; @@ -461,7 +461,7 @@ static int draw_graph(struct data *d, const char *path) /* iterate the globals */ spa_list_for_each(g, &d->globals, link) { /* skip null and non-info globals */ - if (g == NULL || g->info == NULL) + if (g->info == NULL) continue; /* always skip ports since they are drawn by the nodes */