library: Drop cb_data_

We really don't need it as repetition is negligible.  More imporantly, using explicit
paramaters (cb, cb_data) is far more readable than looking for yet another macro def.

Change-Id: Ibb0c3a3723deec76b4fa615546343393e6b82920

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index f73864f..1782d23 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -849,8 +849,6 @@ EXPORT_API int subsession_switch_user(int session_uid, const subsession_user_t n
        ))
 }
 
-#define cb_data_ cb, cb_data
-
 typedef struct {
        signal_client_data_t *signal_client_data;
        int error;
@@ -923,7 +921,7 @@ static int register_event_callback(client_callbacks_data_t *callbacks_data, GDBu
                return_with_log_error_result_(SUBSESSION_ERROR_OUT_OF_MEMORY)
        }
 
-       registered_signal_t registered_signal = subsession_register_event_in_list(callbacks_data, default_wait_params_, cb_data_ );
+       registered_signal_t registered_signal = subsession_register_event_in_list(callbacks_data, default_wait_params_, cb, cb_data);
 
        if(registered_signal.error != SUBSESSION_ERROR_NONE) {
                LOGE("registered_signal.error = %d", registered_signal.error);
@@ -954,7 +952,7 @@ static int subscribe_only_callback(client_callbacks_data_t *callbacks_data, GDBu
                return_with_log_error_result_(SUBSESSION_ERROR_OUT_OF_MEMORY);
        }
 
-       registered_signal_t registered_signal = subsession_register_event_in_list(callbacks_data, default_wait_params_, cb_data_ );
+       registered_signal_t registered_signal = subsession_register_event_in_list(callbacks_data, default_wait_params_, cb, cb_data);
 
 
        if(registered_signal.error != SUBSESSION_ERROR_NONE) {