From 5581d2aee36e2fd96be1b6de4afb50d09a84eb5f Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Fri, 18 Dec 2020 11:07:59 +0530 Subject: [PATCH] Fix SVACE warning NO_UNLOCK Change-Id: I53da5e93427b95bef6d58e3d1d80ce9c7de445e8 Signed-off-by: Nishant Chaprana --- src/tethering.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 114 insertions(+), 21 deletions(-) diff --git a/src/tethering.c b/src/tethering.c index 85f21f7..18c2651 100755 --- a/src/tethering.c +++ b/src/tethering.c @@ -365,7 +365,11 @@ static void __handle_dhcp(GDBusConnection *connection, const gchar *sender_name, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; bool opened = false; @@ -439,7 +443,11 @@ static void __handle_net_closed(GDBusConnection *connection, const gchar *sender DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = 0; @@ -469,7 +477,11 @@ static void __handle_wifi_tether_on(GDBusConnection *connection, const gchar *se DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_WIFI; @@ -504,7 +516,11 @@ static void __handle_wifi_tether_off(GDBusConnection *connection, const gchar *s DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_WIFI; @@ -546,7 +562,11 @@ static void __handle_usb_tether_on(GDBusConnection *connection, const gchar *sen DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_USB; @@ -581,7 +601,11 @@ static void __handle_usb_tether_off(GDBusConnection *connection, const gchar *se DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_USB; @@ -622,7 +646,11 @@ static void __handle_bt_tether_on(GDBusConnection *connection, const gchar *send DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_BT; @@ -657,7 +685,11 @@ static void __handle_bt_tether_off(GDBusConnection *connection, const gchar *sen DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = TETHERING_TYPE_BT; @@ -700,7 +732,11 @@ static void __handle_no_data_timeout(GDBusConnection *connection, const gchar *s DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = 0; @@ -734,7 +770,11 @@ static void __handle_low_battery_mode(GDBusConnection *connection, const gchar * DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = 0; @@ -768,7 +808,11 @@ static void __handle_flight_mode(GDBusConnection *connection, const gchar *sende DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } __tethering_h *th = (__tethering_h *)user_data; tethering_type_e type = 0; @@ -803,7 +847,12 @@ static void __handle_security_type_changed(GDBusConnection *connection, const gc DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + __tethering_h *th = (__tethering_h *)user_data; tethering_wifi_security_type_changed_cb scb = NULL; @@ -853,7 +902,12 @@ static void __handle_ssid_visibility_changed(GDBusConnection *connection, const DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + __tethering_h *th = (__tethering_h *)user_data; tethering_wifi_ssid_visibility_changed_cb scb = NULL; @@ -892,7 +946,12 @@ static void __handle_passphrase_changed(GDBusConnection *connection, const gchar DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + __tethering_h *th = (__tethering_h *)user_data; tethering_wifi_passphrase_changed_cb pcb = NULL; @@ -924,7 +983,12 @@ static void __wifi_enabled_cfm_cb(GObject *source_object, GAsyncResult *res, INFO("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + GError *g_error = NULL; GVariant *g_var; guint info; @@ -988,7 +1052,12 @@ static void __bt_enabled_cfm_cb(GObject *source_object, GAsyncResult *res, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + GError *g_error = NULL; GVariant *g_var; guint info; @@ -1050,7 +1119,12 @@ static void __usb_enabled_cfm_cb(GObject *source_object, GAsyncResult *res, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + __tethering_h *th = (__tethering_h *)user_data; GError *g_error = NULL; GVariant *g_var; @@ -1111,7 +1185,12 @@ static void __p2p_enabled_cfm_cb(GObject *source_object, GAsyncResult *res, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + __tethering_h *th = (__tethering_h *)user_data; GError *g_error = NULL; GVariant *g_var; @@ -1167,7 +1246,12 @@ static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res, INFO("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + GError *g_error = NULL; GVariant *g_var; guint info, event_type; @@ -1285,7 +1369,11 @@ static void __get_data_usage_cb(GObject *source_object, GAsyncResult *res, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } GError *g_error = NULL; GVariant *g_var; @@ -1337,7 +1425,12 @@ static void __settings_reloaded_cb(GObject *source_object, GAsyncResult *res, DBG("+\n"); TETHERING_LOCK; - _retm_if(user_data == NULL, "parameter(user_data) is NULL\n"); + if (user_data == NULL) { + ERR("parameter(user_data) is NULL"); + TETHERING_UNLOCK; + return; + } + GError *g_error = NULL; GVariant *g_var; guint info; -- 2.7.4