From 9c218b2d08b55b3771c8c8addbadb4352b9609a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 16 Nov 2021 18:25:32 +0100 Subject: [PATCH] pulse-server: remove unnecessary `NULL` checks `free()` and `pw_properties_free()` already include a NULL check before proceeding. --- src/modules/module-protocol-pulse/client.c | 7 ++----- src/modules/module-protocol-pulse/pulse-server.c | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modules/module-protocol-pulse/client.c b/src/modules/module-protocol-pulse/client.c index 3a6315ff5..0f7f57f92 100644 --- a/src/modules/module-protocol-pulse/client.c +++ b/src/modules/module-protocol-pulse/client.c @@ -144,11 +144,8 @@ void client_free(struct client *client) free(client->default_sink); free(client->default_source); - if (client->props) - pw_properties_free(client->props); - - if (client->routes) - pw_properties_free(client->routes); + pw_properties_free(client->props); + pw_properties_free(client->routes); free(client); } diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index aa7ce29cc..939add174 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -2216,9 +2216,7 @@ static int do_finish_upload_stream(struct client *client, uint32_t command, uint error_errno: res = -errno; - if (sample != NULL) { - free(sample); - } + free(sample); goto error; error_invalid: res = -EINVAL;