library: Use assert() to catch programming errors in make_new_signal_callback_client_...

Change-Id: I9c0b718cab9a010b8094a079e52844b2d03f0619

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index 28ebe13..594435e 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -20,6 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE. */
 
+#include <assert.h>
 #include <gio/gio.h>
 #include <tizen.h>
 #include <ctype.h>
@@ -256,20 +257,18 @@ static int make_sure_connection_is_not_null()
 
 static signal_client_data_t *make_new_signal_callback_client_data(subsession_event_callback client_callback, void *client_callback_data, GVariant *params) {
 
-       if(params == NULL) {
-               return NULL;
-       }
+       assert(params);
+       assert(client_callback);
 
        signal_client_data_t *signal_data = (signal_client_data_t *)malloc(sizeof(signal_client_data_t));
-
-       if(signal_data != NULL) {
+       if (signal_data != NULL) {
                signal_data->client_callback = client_callback;
                signal_data->client_callback_data = client_callback_data;
                signal_data->params = params;
                g_variant_ref_sink(signal_data->params);
-               return signal_data;
        }
-       return NULL;
+
+       return signal_data;
 }
 
 static gint g_compare_session_uid_params(gconstpointer client_data, gconstpointer parameters) {
@@ -670,9 +669,9 @@ static void client_data_cleansweep_mt( signal_client_data_t *signal_client_data,
 
 static int init_callbacks_list(client_callbacks_data_t *callbacks_data, GVariant *params) {
 
-       if(callbacks_data->list == NULL) {
+       if (callbacks_data->list == NULL) {
                signal_client_data_t *signal_client_empty_data = make_new_signal_callback_client_data(NULL, NULL, params);
-               if(signal_client_empty_data == NULL) {
+               if (signal_client_empty_data == NULL) {
                        return_with_log_error_result_(SUBSESSION_ERROR_OUT_OF_MEMORY)
                }
                callbacks_data->list = g_list_append(callbacks_data->list, (gpointer) signal_client_empty_data);
@@ -815,7 +814,6 @@ static registered_signal_t subsession_register_event_in_list(client_callbacks_da
        }
 
        signal_client_data_t *signal_client_data = make_new_signal_callback_client_data(cb, cb_data, params);
-
        if (signal_client_data == NULL) {
                        g_mutex_unlock(&callbacks_data->mutex);
                        registered_signal.error = SUBSESSION_ERROR_OUT_OF_MEMORY;
@@ -882,9 +880,8 @@ static int register_event_callback(client_callbacks_data_t *callbacks_data, GDBu
 
 static int subscribe_only_callback(client_callbacks_data_t *callbacks_data, GDBusSignalCallback signal_callback, int session_uid, subsession_event_callback cb, void *cb_data) {
 
-       GVariant * params = g_variant_new("(i)", session_uid);
-
-       if(params == NULL) {
+       GVariant *params = g_variant_new("(i)", session_uid);
+       if (params == NULL) {
                return_with_log_error_result_(SUBSESSION_ERROR_OUT_OF_MEMORY);
        }