library: Replace dynamic error checking with asserts in unregister()

It's programming error to pass NULL callbacks_data - catch it early
with assert.

Change-Id: Id6ed5861c2a5ce38e0e148e9cf177170a1661d4f

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index f5fdfde..2ae8d15 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -736,16 +736,15 @@ EXPORT_API int subsession_register_event_callback(int session_uid, subsession_ev
        return SUBSESSION_ERROR_NONE;
 }
 
-static int unregister_event_callback(client_callbacks_data_t *callbacks_data, int session_uid) {
+static int unregister_event_callback(client_callbacks_data_t *callbacks_data, int session_uid)
+{
+       assert(callbacks_data);
 
-       return_if(
-               callbacks_data_are_null(callbacks_data,
-               session_uid_is_not_valid(session_uid))
-       )
+       return_if(session_uid_is_not_valid(session_uid))
 
        MAKE_SURE_CONNECTION_IS_NOT_NULL();
-       g_autoptr(GVariant) gv_session_uid = g_variant_new("(i)", session_uid);
 
+       g_autoptr(GVariant) gv_session_uid = g_variant_new("(i)", session_uid);
        signal_client_data_t *signal_data = callbacks_data_pop(callbacks_data, gv_session_uid, g_compare_session_uid);
        if (signal_data == NULL) {
                return_with_log_error_result_(SUBSESSION_ERROR_NOT_AVAILABLE)
@@ -762,11 +761,11 @@ static int unregister_event_callback(client_callbacks_data_t *callbacks_data, in
        return SUBSESSION_ERROR_NONE;
 }
 
-EXPORT_API int subsession_unregister_event_callback(int session_uid, subsession_event_type_e event_bits){
-
+EXPORT_API int subsession_unregister_event_callback(int session_uid, subsession_event_type_e event_bits)
+{
        /* update pointer according to event bits */
        if (event_bits & SUBSESSION_ADD_USER_WAIT) {
-               ret_if_err_( unregister_event_callback(&add_user_wait_callbacks_data_mt, session_uid))
+               ret_if_err_(unregister_event_callback(&add_user_wait_callbacks_data_mt, session_uid))
        }
        if (event_bits & SUBSESSION_REMOVE_USER_WAIT) {
                ret_if_err_(unregister_event_callback(&remove_user_wait_callbacks_data_mt, session_uid))