library: Rework client_data_cleansweep_mt

This commit:
 - renames function to callbacks_data_remove_client_data as it operates on callbacks_data list
 - changes order of function paramters to follow convention used by callbacks_data_* functions
 - adds asserts to ensure parameters are always valid

Change-Id: I0671a6a6bea783224a0bbe966bea08b4c0ec5d03

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index f50fbba7e138e4dc6b40184e498b95705cc0174d..864c36cd164209498935d31d187604ab22b01ef0 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -607,10 +607,15 @@ static int method_call_no_signal_return(gchar *method, GVariant *params, const G
        return SUBSESSION_ERROR_NONE;
 }
 
-static void client_data_cleansweep_mt( signal_client_data_t *signal_client_data, client_callbacks_data_t *callbacks_data) {
+static void callbacks_data_remove_client_data(client_callbacks_data_t *callbacks_data, signal_client_data_t *signal_client_data)
+{
+       assert(callbacks_data);
+       assert(signal_client_data);
 
        g_mutex_lock(&callbacks_data->mutex);
-               callbacks_data->list = g_list_remove(callbacks_data->list, (gconstpointer) signal_client_data);
+
+       callbacks_data->list = g_list_remove(callbacks_data->list, (gconstpointer)signal_client_data);
+
        g_mutex_unlock(&callbacks_data->mutex);
 
        g_variant_unref(signal_client_data->params);
@@ -791,7 +796,7 @@ static int register_event_callback(client_callbacks_data_t *callbacks_data, GDBu
        }
        log_if_error_(method_call_result)
 
-       client_data_cleansweep_mt(client_data, callbacks_data);
+       callbacks_data_remove_client_data(callbacks_data, client_data);
 
        return method_call_result;
 }
@@ -812,7 +817,7 @@ static int subscribe_only_callback(client_callbacks_data_t *callbacks_data, GDBu
        }
 
        MAKE_SURE_CONNECTION_IS_NOT_NULL(
-               client_data_cleansweep_mt(client_data, callbacks_data);
+               callbacks_data_remove_client_data(callbacks_data, client_data);
        );
 
        if (callbacks_data->dbus_signal_subscribed == 0) {