api: Drop unused return value from subsession_event_callback

Changes in:
  - public interface header (libsessiond.h) authored by Karol Lewandowski
  - the rest implemented by Michal Bloch

Change-Id: I89808022e341a0ec10863181ba8788300b55b648

diff --git a/libsessiond/include/sessiond.h b/libsessiond/include/sessiond.h
index 7810dfb..f9b3994 100644 (file)
--- a/libsessiond/include/sessiond.h
+++ b/libsessiond/include/sessiond.h
@@ -80,9 +80,8 @@ typedef struct subsession_event_info {
  *
  * @param[in] info Information associated with the event itself
  * @param[in] cb_data The user data passed from the callback registration function
- * @remarks Return value from callback is currently unused.
  */
-typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
+typedef void (*subsession_event_callback) (subsession_event_info info, void *cb_data);
 
 /**
  * @brief Register the event "wait lock"

diff --git a/libsessiond/target_test/test_api_adduserwait.cpp b/libsessiond/target_test/test_api_adduserwait.cpp
index e7ca8d2..057c9d9 100644 (file)
--- a/libsessiond/target_test/test_api_adduserwait.cpp
+++ b/libsessiond/target_test/test_api_adduserwait.cpp
@@ -57,23 +57,21 @@ void test_reply_removeuser_callback (void *cb_data) {
        user_data->callback_result = MAGIC_REMOVE;
 }
 
-//typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
 int callback_adduserstarted_reference;
 
-int test_subsession_add_user_wait_callback(subsession_event_info info, void *cb_data) {
+void test_subsession_add_user_wait_callback(subsession_event_info info, void *cb_data) {
 
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
 
-       if(cb_data == NULL) return -1;
+       if (cb_data == NULL)
+               return;
 
        user_data->user_id = info.add_user.user;
        user_data->session_uid = info.session_uid;
 
        user_data->callback_result = subsession_event_wait_done(test_subsession_uid, info.event, info);
        g_atomic_int_inc(&callback_adduserstarted_reference);
-
-       return 0;
 }
 
 using ud_ = struct ud_ctrl_t<int*, int*, int*>;

diff --git a/libsessiond/target_test/test_api_reg_unreg_add_user_wait.cpp b/libsessiond/target_test/test_api_reg_unreg_add_user_wait.cpp
index 95bfebe..f2491d9 100644 (file)
--- a/libsessiond/target_test/test_api_reg_unreg_add_user_wait.cpp
+++ b/libsessiond/target_test/test_api_reg_unreg_add_user_wait.cpp
@@ -51,22 +51,20 @@ void test_reply_removeuser_callback (void *cb_data) {
        user_data->callback_result = MAGIC_REMOVE;
 }
 
-//typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
 int callback_adduserstarted_reference;
 
-int test_subsession_add_user_wait_callback(subsession_event_info info, void *cb_data) {
+void test_subsession_add_user_wait_callback(subsession_event_info info, void *cb_data) {
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
 
-       if(cb_data == NULL) return -1;
+       if (cb_data == NULL)
+               return;
 
        user_data->user_id = info.add_user.user;
        user_data->session_uid = info.session_uid;
 
        user_data->callback_result = subsession_event_wait_done(test_subsession_uid, info.event, info);
        g_atomic_int_inc(&callback_adduserstarted_reference);
-
-       return 0;
 }
 
 using ud_ = struct ud_ctrl_t<int*, int*, int*>;

diff --git a/libsessiond/target_test/test_api_removeuserwait.cpp b/libsessiond/target_test/test_api_removeuserwait.cpp
index bdca83e..265cf9c 100644 (file)
--- a/libsessiond/target_test/test_api_removeuserwait.cpp
+++ b/libsessiond/target_test/test_api_removeuserwait.cpp
@@ -51,14 +51,14 @@ void test_reply_removeuser_callback (void *cb_data) {
        user_data->callback_result = MAGIC_REMOVE;
 }
 
-//typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
 int callback_remove_user_started_reference;
 
-int test_subsession_remove_user_wait_callback(subsession_event_info info, void *cb_data) {
+void test_subsession_remove_user_wait_callback(subsession_event_info info, void *cb_data) {
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
 
-       if(cb_data == NULL) return -1;
+       if (cb_data == NULL)
+               return;
 
        user_data->user_id = info.remove_user.user;
        user_data->session_uid = info.session_uid;
@@ -68,7 +68,6 @@ int test_subsession_remove_user_wait_callback(subsession_event_info info, void *
        user_data->callback_result = subsession_event_wait_done(test_subsession_uid, info.event, info);
 
        g_atomic_int_inc(&callback_remove_user_started_reference);
-       return 0;
 }
 
 using ud_ = struct ud_ctrl_t<int*, int*, int*>;

diff --git a/libsessiond/target_test/test_api_switch_user_completion.cpp b/libsessiond/target_test/test_api_switch_user_completion.cpp
index 992a2b7..5041600 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_completion.cpp
+++ b/libsessiond/target_test/test_api_switch_user_completion.cpp
@@ -18,7 +18,7 @@ void test_switch_callback(void *cb_data) {
        g_atomic_int_inc(&user_data->callback_reference);
 }
 
-int test_subsession_switch_user_completion_callback(subsession_event_info info, void *cb_data) {
+void test_subsession_switch_user_completion_callback(subsession_event_info info, void *cb_data) {
 
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
        user_data->session_uid = info.session_uid;
@@ -31,8 +31,6 @@ int test_subsession_switch_user_completion_callback(subsession_event_info info,
                user_data->callback_result = 0;
                g_atomic_int_inc(&user_data->callback_reference);
        }
-
-       return 0;
 }
 
 enum {

diff --git a/libsessiond/target_test/test_api_switch_user_wait.cpp b/libsessiond/target_test/test_api_switch_user_wait.cpp
index 5294552..7251e35 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_wait.cpp
+++ b/libsessiond/target_test/test_api_switch_user_wait.cpp
@@ -13,7 +13,7 @@
 //const int user_1 = 1;
 //const int user_2 = 2;
 
-int test_subsession_switch_user_wait_callback(subsession_event_info info, void *cb_data) {
+void test_subsession_switch_user_wait_callback(subsession_event_info info, void *cb_data) {
 
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
 
@@ -26,8 +26,6 @@ int test_subsession_switch_user_wait_callback(subsession_event_info info, void *
        if (user_data->user_id == TestUser::user_0 || user_data->user_id == TestUser::user_2) {
                g_atomic_int_inc(&user_data->callback_reference);
        }
-
-       return 0;
 }
 
 enum {