From 713db704fea9fcdc1207b0283e9e6d1351895767 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Mon, 6 Apr 2020 13:03:04 +0900 Subject: [PATCH] Remove null check for nullable function Change-Id: If724198ed0343a528ce749c88042a8e147ec3918 --- src/media_controller_ipc.c | 6 ++---- svc/media_controller_db_util.c | 6 ++---- test/client_test/media_controller_client_test.c | 2 +- test/server_test/media_controller_server_test.c | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c index 945a119..2daba8d 100644 --- a/src/media_controller_ipc.c +++ b/src/media_controller_ipc.c @@ -130,8 +130,7 @@ static int __dbus_send_message(GDBusConnection *connection, const char *dbus_nam &error); if (!emmiting) { mc_error("g_dbus_connection_emit_signal failed : %s", error ? error->message : "none"); - if (error) - g_error_free(error); + g_error_free(error); return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION; } @@ -149,7 +148,7 @@ int _mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count) _connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!_connection) { mc_error("g_bus_get_sync failed : %s", error ? error->message : "none"); - if (error) g_error_free(error); + g_error_free(error); return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION; } @@ -158,7 +157,6 @@ int _mc_ipc_get_dbus_connection(GDBusConnection **connection, int *dref_count) mc_debug("Reference count : %d", *dref_count); - if (error) g_error_free(error); return MEDIA_CONTROLLER_ERROR_NONE; } diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c index 5eb4584..1df58a6 100644 --- a/svc/media_controller_db_util.c +++ b/svc/media_controller_db_util.c @@ -428,14 +428,12 @@ int mc_db_util_remove_db(uid_t uid) if (!result) { mc_error("g_file_delete failed: %s", g_error ? g_error->message : "none"); ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION; + g_error_free(g_error); } else { mc_warning("Abnormal db has been removed."); } - if (db_file) - g_object_unref(db_file); - if (g_error) - g_error_free(g_error); + g_object_unref(db_file); mc_debug_fleave(); diff --git a/test/client_test/media_controller_client_test.c b/test/client_test/media_controller_client_test.c index 03c04c4..756c986 100755 --- a/test/client_test/media_controller_client_test.c +++ b/test/client_test/media_controller_client_test.c @@ -1198,7 +1198,7 @@ gboolean input(GIOChannel *channel, GIOCondition cond, gpointer data) status = g_io_channel_read_chars(channel, buf, MAX_STRING_LEN, &read, &error); if (status != G_IO_STATUS_NORMAL) { g_print("g_io_channel_read_chars failed : %s", error ? error->message : "none"); - if (error) g_error_free(error); + g_error_free(error); return FALSE; } diff --git a/test/server_test/media_controller_server_test.c b/test/server_test/media_controller_server_test.c index edaeb9f..2257f4e 100755 --- a/test/server_test/media_controller_server_test.c +++ b/test/server_test/media_controller_server_test.c @@ -1408,7 +1408,7 @@ static gboolean __input(GIOChannel *channel, GIOCondition cond, gpointer data) status = g_io_channel_read_chars(channel, buf, MAX_STRING_LEN, &read, &error); if (status != G_IO_STATUS_NORMAL) { g_print("g_io_channel_read_chars failed : %s", error ? error->message : "none"); - if (error) g_error_free(error); + g_error_free(error); return FALSE; } -- 2.7.4