api: Drop unused paramaters and return value from subsession_reply_callback

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

Change-Id: I7d391d4f57fee0925fa0ccb57c2a4d2e99d88c98

diff --git a/libsessiond/include/sessiond.h b/libsessiond/include/sessiond.h
index 700ccdf..7810dfb 100644 (file)
--- a/libsessiond/include/sessiond.h
+++ b/libsessiond/include/sessiond.h
@@ -126,11 +126,10 @@ int subsession_unregister_event_callback(int session_uid, subsession_event_type_
  * @brief Callback fired when requested operation completes.
  * @since_tizen 7.0
  *
- * @param[in] result Status code (currently unused)
  * @param[in] cb_data The user data passed from the callback registration function
- * @remarks Return value from callback is currently unused.
+ * @remarks Callback will be called only when operation succeeds.
  */
-typedef int (*subsession_reply_callback) (int result, void *cb_data);
+typedef void (*subsession_reply_callback) (void *cb_data);
 
 /**
  * @brief Request new subsession to be created.

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index 1861e8e..4ba6fa3 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -382,7 +382,7 @@ static void call_reply_callback(signal_client_data_t *signal_data, int ret_statu
 
        subsession_reply_callback reply_cb = signal_data->client_callback;
        void *client_callback_data = signal_data->client_callback_data;
-       reply_cb(ret_status, client_callback_data);
+       reply_cb(client_callback_data);
 }
 
 static void signal_user_ops_complete_handler(

diff --git a/libsessiond/target_test/test_api_add_remove_user.cpp b/libsessiond/target_test/test_api_add_remove_user.cpp
index 324e66e..3698d62 100644 (file)
--- a/libsessiond/target_test/test_api_add_remove_user.cpp
+++ b/libsessiond/target_test/test_api_add_remove_user.cpp
@@ -38,39 +38,27 @@ gboolean callback_pending_o(gpointer data) {
   return TRUE;
 }
 
-int test_reply_adduser_callback_o (int result, void *cb_data) {
+void test_reply_adduser_callback_o (void *cb_data) {
 
        g_atomic_int_inc(&callback_pending_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_ADD;
 }
 
-int test_reply_removeuser_callback_o (int result, void *cb_data) {
+void test_reply_removeuser_callback_o (void *cb_data) {
 
        g_atomic_int_inc(&callback_pending_reference);
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_REMOVE;
 }
 
 TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
@@ -99,8 +87,6 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
 
        EXPECT_EQ(add_user_res, 0);
        EXPECT_EQ(remove_user_res, 0);
-       EXPECT_EQ(0, test_add_ud_o.callback_result);
-       EXPECT_EQ(0, test_remove_ud_o.callback_result);
-
-       //EXPECT_EQ(0,1);
+       EXPECT_EQ(MAGIC_ADD, test_add_ud_o.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_ud_o.callback_result);
 }

diff --git a/libsessiond/target_test/test_api_adduserwait.cpp b/libsessiond/target_test/test_api_adduserwait.cpp
index be203fd..e7ca8d2 100644 (file)
--- a/libsessiond/target_test/test_api_adduserwait.cpp
+++ b/libsessiond/target_test/test_api_adduserwait.cpp
@@ -31,38 +31,30 @@ bool all_true(Args... args)
 
 int callback_adduser_reference;
 
-int test_reply_adduser_callback (int result, void *cb_data) {
+void test_reply_adduser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_ADD;
 }
 
 int callback_removeuser_reference;
 
-int test_reply_removeuser_callback (int result, void *cb_data) {
+void test_reply_removeuser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       return result;
+       user_data->callback_result = MAGIC_REMOVE;
 }
 
 //typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
@@ -138,6 +130,6 @@ TEST(subsession_add_user_wait_test, APIAddUserWaitTest) {
        EXPECT_EQ(2, test_add_wait_1_2.user_id);
        EXPECT_EQ(test_subsession_uid, test_add_wait_1_2.session_uid);
 
-       EXPECT_EQ(0, test_add_1_2.callback_result);
-       EXPECT_EQ(0, test_remove_1_2.callback_result);
+       EXPECT_EQ(MAGIC_ADD, test_add_1_2.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
 }

diff --git a/libsessiond/target_test/test_api_get_user_list.cpp b/libsessiond/target_test/test_api_get_user_list.cpp
index 922d49c..476a691 100644 (file)
--- a/libsessiond/target_test/test_api_get_user_list.cpp
+++ b/libsessiond/target_test/test_api_get_user_list.cpp
@@ -9,11 +9,8 @@
 // Let's test against the owner user.
 constexpr int tested_user = 5001;
 
-int callback(int result, void *data) {
-
-       // The add and remove user functions will call this,
-       // which will just propagate the result.
-       return result;
+void callback(void *data) {
+       // Nothing happens here but the callback cannot be null
 }
 
 TEST(subsession_get_user_list_test, APIGetUserListTest) {

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 7ab680f..95bfebe 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
@@ -25,38 +25,30 @@ typedef struct {
 
 int callback_adduser_reference;
 
-int test_reply_adduser_callback (int result, void *cb_data) {
+void test_reply_adduser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_ADD;
 }
 
 int callback_removeuser_reference;
 
-int test_reply_removeuser_callback (int result, void *cb_data) {
+void test_reply_removeuser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       return result;
+       user_data->callback_result = MAGIC_REMOVE;
 }
 
 //typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
@@ -132,8 +124,8 @@ TEST(subsession_register_and_remove_user_wait_test, APIRegisterAndRemoveAddUserW
        EXPECT_EQ(-3, test_add_wait_1_2.user_id);
        EXPECT_EQ(-1, test_add_wait_1_2.session_uid);
 
-       EXPECT_EQ(0, test_add_1_2.callback_result);
-       EXPECT_EQ(0, test_remove_1_2.callback_result);
+       EXPECT_EQ(MAGIC_ADD, test_add_1_2.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
        EXPECT_EQ(rem_add_user_wait_res_1_2, 0);
 
 }

diff --git a/libsessiond/target_test/test_api_removeuserwait.cpp b/libsessiond/target_test/test_api_removeuserwait.cpp
index caaa5f0..bdca83e 100644 (file)
--- a/libsessiond/target_test/test_api_removeuserwait.cpp
+++ b/libsessiond/target_test/test_api_removeuserwait.cpp
@@ -25,38 +25,30 @@ typedef struct {
 
 int callback_adduser_reference;
 
-int test_reply_adduser_callback (int result, void *cb_data) {
+void test_reply_adduser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_ADD;
 }
 
 int callback_removeuser_reference;
 
-int test_reply_removeuser_callback (int result, void *cb_data) {
+void test_reply_removeuser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = result;
-
-       return result;
+       user_data->callback_result = MAGIC_REMOVE;
 }
 
 //typedef int (*subsession_event_callback) (subsession_event_info info, void *cb_data);
@@ -134,6 +126,6 @@ TEST(subsession_remove_user_wait_test, APIRemoveUserWaitTest) {
        EXPECT_EQ(2, test_remove_wait_1_2.user_id);
        EXPECT_EQ(test_subsession_uid, test_remove_wait_1_2.session_uid);
 
-       EXPECT_EQ(0, test_add_1_2.callback_result);
-       EXPECT_EQ(0, test_remove_1_2.callback_result);
+       EXPECT_EQ(MAGIC_ADD, test_add_1_2.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
 }

diff --git a/libsessiond/target_test/test_api_switch_user_completion.cpp b/libsessiond/target_test/test_api_switch_user_completion.cpp
index 2b78ea0..992a2b7 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_completion.cpp
+++ b/libsessiond/target_test/test_api_switch_user_completion.cpp
@@ -10,16 +10,12 @@
 
 #include "test_hlp.hpp"
 
-int test_switch_callback(int result, void *cb_data) {
+void test_switch_callback(void *cb_data) {
 
-       //std::cout << " test_switch_callback" << std::endl;
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
 
-       user_data->callback_result = result;
+       user_data->callback_result = MAGIC_SWITCH;
        g_atomic_int_inc(&user_data->callback_reference);
-
-       //std::cout << " test_switch_callback end" << std::endl;
-       return result;
 }
 
 int test_subsession_switch_user_completion_callback(subsession_event_info info, void *cb_data) {
@@ -98,12 +94,12 @@ TEST(subsession_switch_user_completion, APISwitchUserCompletion) {
        EXPECT_EQ(add_user_res_2, 0);
        EXPECT_EQ(remove_user_res_2, 0);
 
-       EXPECT_EQ(0, std::get<add_user_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<add_user_2>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<switch_user_to_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<switch_user_to_2>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<remove_user_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<remove_user_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<add_user_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<add_user_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_SWITCH, std::get<switch_user_to_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_SWITCH, std::get<switch_user_to_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<remove_user_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<remove_user_2>(ud.t).callback_result);
 
        auto &user_data_result = std::get<switch_completion>(ud.t);
 

diff --git a/libsessiond/target_test/test_api_switch_user_wait.cpp b/libsessiond/target_test/test_api_switch_user_wait.cpp
index d9b6f3e..5294552 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_wait.cpp
+++ b/libsessiond/target_test/test_api_switch_user_wait.cpp
@@ -89,13 +89,13 @@ TEST(subsession_switch_user_wait, APISwitchUserStarted) {
        EXPECT_EQ(add_user_res_2, 0);
        EXPECT_EQ(remove_user_res_2, 0);
 
-       EXPECT_EQ(0, std::get<add_user_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<add_user_2>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<switch_user_to_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<switch_user_to_2>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<switch_user_to_0>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<remove_user_1>(ud.t).callback_result);
-       EXPECT_EQ(0, std::get<remove_user_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<add_user_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<add_user_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<switch_user_to_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<switch_user_to_2>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<switch_user_to_0>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<remove_user_1>(ud.t).callback_result);
+       EXPECT_EQ(MAGIC_DEFAULT, std::get<remove_user_2>(ud.t).callback_result);
 
 
        auto &user_data_result = std::get<switch_wait>(ud.t);

diff --git a/libsessiond/target_test/test_api_switchuser.cpp b/libsessiond/target_test/test_api_switchuser.cpp
index 1821864..f864284 100644 (file)
--- a/libsessiond/target_test/test_api_switchuser.cpp
+++ b/libsessiond/target_test/test_api_switchuser.cpp
@@ -3,6 +3,7 @@
 #include <gio/gio.h>
 #include <pthread.h>
 #include "sessiond.h"
+#include "test_hlp.hpp"
 
 // Test
 
@@ -55,58 +56,40 @@ gboolean callback_pending(gpointer data) {
   return TRUE;
 }
 
-int test_reply_adduser_callback (int result, void *cb_data) {
+void test_reply_adduser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_ADD;
 }
 
-int test_reply_switchuser_callback (int result, void *cb_data) {
+void test_reply_switchuser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_switchuser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data_switch *user_data = (test_user_data_switch *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_SWITCH;
 }
 
-int test_reply_removeuser_callback (int result, void *cb_data) {
+void test_reply_removeuser_callback (void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
        if (cb_data == NULL) {
-               return -EBADR;
+               return;
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = result;
-
-       if (result < 0) {
-               return result;
-       }
-
-       return 0;
+       user_data->callback_result = MAGIC_REMOVE;
 }
 
 TEST(subsession_switch_user_test, APISwitchUserTest) {
@@ -185,10 +168,10 @@ TEST(subsession_switch_user_test, APISwitchUserTest) {
 
        EXPECT_EQ(got_current_user, 2);
 
-       EXPECT_EQ(0, test_add_1_1.callback_result);
-       EXPECT_EQ(0, test_add_1_2.callback_result);
-       EXPECT_EQ(0, test_switch_1_1_to_2.callback_result);
-       EXPECT_EQ(0, test_switch_1_2_to_0.callback_result);
-       EXPECT_EQ(0, test_remove_1_1.callback_result);
-       EXPECT_EQ(0, test_remove_1_2.callback_result);
+       EXPECT_EQ(MAGIC_ADD   , test_add_1_1.callback_result);
+       EXPECT_EQ(MAGIC_ADD   , test_add_1_2.callback_result);
+       EXPECT_EQ(MAGIC_SWITCH, test_switch_1_1_to_2.callback_result);
+       EXPECT_EQ(MAGIC_SWITCH, test_switch_1_2_to_0.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_1.callback_result);
+       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
 }

diff --git a/libsessiond/target_test/test_hlp.hpp b/libsessiond/target_test/test_hlp.hpp
index f4bb714..fa6e299 100644 (file)
--- a/libsessiond/target_test/test_hlp.hpp
+++ b/libsessiond/target_test/test_hlp.hpp
@@ -123,14 +123,20 @@ void atomic_set_0(T arg, V... args) {
        return;
 }
 */
-int test_reply_callback_default (int result, void *cb_data) {
+
+/* Magic constants set by various callbacks
+ * to verify whether they were called. */
+static constexpr int MAGIC_ADD     = 111;
+static constexpr int MAGIC_REMOVE  = 222;
+static constexpr int MAGIC_SWITCH  = 333;
+static constexpr int MAGIC_DEFAULT = 444;
+
+void test_reply_callback_default (void *cb_data) {
 
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
 
-       user_data->callback_result = result;
+       user_data->callback_result = MAGIC_DEFAULT;
        g_atomic_int_inc(&user_data->callback_reference);
-
-       return result;
 }
 
 template<typename T>