Revert 'result' parameter in subsession_reply_callback

Change-Id: I8397ebe73780a05ba4be2cf3f01eaa4974d06e74

diff --git a/libsessiond/include/sessiond.h b/libsessiond/include/sessiond.h
index a9a4498..3db106a 100644 (file)
--- a/libsessiond/include/sessiond.h
+++ b/libsessiond/include/sessiond.h
@@ -124,11 +124,11 @@ 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
  * @param[in] cb_data The user data passed from the callback registration function
  * @remarks Callback will be called only when operation succeeds.
  */
-typedef void (*subsession_reply_callback) (void *cb_data);
+typedef void (*subsession_reply_callback) (int result, void *cb_data);
 
 /**
  * @brief Request new subsession to be created.

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index 8fefa42..fe28b00 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -407,7 +407,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(client_callback_data);
+       reply_cb(ret_status, 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 3698d62..5911e53 100644 (file)
--- a/libsessiond/target_test/test_api_add_remove_user.cpp
+++ b/libsessiond/target_test/test_api_add_remove_user.cpp
@@ -38,7 +38,7 @@ gboolean callback_pending_o(gpointer data) {
   return TRUE;
 }
 
-void test_reply_adduser_callback_o (void *cb_data) {
+void test_reply_adduser_callback_o (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_pending_reference);
 
@@ -47,10 +47,10 @@ void test_reply_adduser_callback_o (void *cb_data) {
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = MAGIC_ADD;
+       user_data->callback_result = result;
 }
 
-void test_reply_removeuser_callback_o (void *cb_data) {
+void test_reply_removeuser_callback_o (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_pending_reference);
        if (cb_data == NULL) {
@@ -58,7 +58,7 @@ void test_reply_removeuser_callback_o (void *cb_data) {
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = MAGIC_REMOVE;
+       user_data->callback_result = result;
 }
 
 TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
@@ -87,6 +87,6 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
 
        EXPECT_EQ(add_user_res, 0);
        EXPECT_EQ(remove_user_res, 0);
-       EXPECT_EQ(MAGIC_ADD, test_add_ud_o.callback_result);
-       EXPECT_EQ(MAGIC_REMOVE, test_remove_ud_o.callback_result);
+       EXPECT_EQ(0, test_add_ud_o.callback_result);
+       EXPECT_EQ(0, 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 5749d05..d95ade4 100644 (file)
--- a/libsessiond/target_test/test_api_adduserwait.cpp
+++ b/libsessiond/target_test/test_api_adduserwait.cpp
@@ -31,7 +31,7 @@ bool all_true(Args... args)
 
 int callback_adduser_reference;
 
-void test_reply_adduser_callback (void *cb_data) {
+void test_reply_adduser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
@@ -40,12 +40,12 @@ void test_reply_adduser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_ADD;
+       user_data->callback_result = result;
 }
 
 int callback_removeuser_reference;
 
-void test_reply_removeuser_callback (void *cb_data) {
+void test_reply_removeuser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
@@ -54,7 +54,7 @@ void test_reply_removeuser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_REMOVE;
+       user_data->callback_result = result;
 }
 
 int callback_adduserstarted_reference;
@@ -128,6 +128,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(MAGIC_ADD, test_add_1_2.callback_result);
-       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
+       EXPECT_EQ(0, test_add_1_2.callback_result);
+       EXPECT_EQ(0, test_remove_1_2.callback_result);
 }

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 f32a692..ae2fc57 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,7 +25,7 @@ typedef struct {
 
 int callback_adduser_reference;
 
-void test_reply_adduser_callback (void *cb_data) {
+void test_reply_adduser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
@@ -34,12 +34,12 @@ void test_reply_adduser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_ADD;
+       user_data->callback_result = result;
 }
 
 int callback_removeuser_reference;
 
-void test_reply_removeuser_callback (void *cb_data) {
+void test_reply_removeuser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
@@ -48,7 +48,7 @@ void test_reply_removeuser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_REMOVE;
+       user_data->callback_result = result;
 }
 
 int callback_adduserstarted_reference;
@@ -122,8 +122,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(MAGIC_ADD, test_add_1_2.callback_result);
-       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
+       EXPECT_EQ(0, test_add_1_2.callback_result);
+       EXPECT_EQ(0, 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 890df84..01ea881 100644 (file)
--- a/libsessiond/target_test/test_api_removeuserwait.cpp
+++ b/libsessiond/target_test/test_api_removeuserwait.cpp
@@ -25,7 +25,7 @@ typedef struct {
 
 int callback_adduser_reference;
 
-void test_reply_adduser_callback (void *cb_data) {
+void test_reply_adduser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
@@ -34,12 +34,12 @@ void test_reply_adduser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_ADD;
+       user_data->callback_result = result;
 }
 
 int callback_removeuser_reference;
 
-void test_reply_removeuser_callback (void *cb_data) {
+void test_reply_removeuser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
@@ -48,7 +48,7 @@ void test_reply_removeuser_callback (void *cb_data) {
        }
 
        test_user_data_t *user_data = (test_user_data_t *)cb_data;
-       user_data->callback_result = MAGIC_REMOVE;
+       user_data->callback_result = result;
 }
 
 int callback_remove_user_started_reference;
@@ -125,6 +125,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(MAGIC_ADD, test_add_1_2.callback_result);
-       EXPECT_EQ(MAGIC_REMOVE, test_remove_1_2.callback_result);
+       EXPECT_EQ(0, test_add_1_2.callback_result);
+       EXPECT_EQ(0, 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 5041600..78815a3 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_completion.cpp
+++ b/libsessiond/target_test/test_api_switch_user_completion.cpp
@@ -10,11 +10,11 @@
 
 #include "test_hlp.hpp"
 
-void test_switch_callback(void *cb_data) {
+void test_switch_callback(int result, void *cb_data) {
 
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
 
-       user_data->callback_result = MAGIC_SWITCH;
+       user_data->callback_result = result;
        g_atomic_int_inc(&user_data->callback_reference);
 }
 
@@ -92,12 +92,12 @@ TEST(subsession_switch_user_completion, APISwitchUserCompletion) {
        EXPECT_EQ(add_user_res_2, 0);
        EXPECT_EQ(remove_user_res_2, 0);
 
-       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);
+       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);
 
        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 8b6499c..751fa4d 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_wait.cpp
+++ b/libsessiond/target_test/test_api_switch_user_wait.cpp
@@ -87,13 +87,13 @@ TEST(subsession_switch_user_wait, APISwitchUserStarted) {
        EXPECT_EQ(add_user_res_2, 0);
        EXPECT_EQ(remove_user_res_2, 0);
 
-       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);
+       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);
 
 
        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 f864284..711fe53 100644 (file)
--- a/libsessiond/target_test/test_api_switchuser.cpp
+++ b/libsessiond/target_test/test_api_switchuser.cpp
@@ -56,7 +56,7 @@ gboolean callback_pending(gpointer data) {
   return TRUE;
 }
 
-void test_reply_adduser_callback (void *cb_data) {
+void test_reply_adduser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduser_reference);
 
@@ -65,10 +65,10 @@ void test_reply_adduser_callback (void *cb_data) {
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = MAGIC_ADD;
+       user_data->callback_result = result;
 }
 
-void test_reply_switchuser_callback (void *cb_data) {
+void test_reply_switchuser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_switchuser_reference);
 
@@ -77,10 +77,10 @@ void test_reply_switchuser_callback (void *cb_data) {
        }
 
        test_user_data_switch *user_data = (test_user_data_switch *)cb_data;
-       user_data->callback_result = MAGIC_SWITCH;
+       user_data->callback_result = result;
 }
 
-void test_reply_removeuser_callback (void *cb_data) {
+void test_reply_removeuser_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuser_reference);
 
@@ -89,7 +89,7 @@ void test_reply_removeuser_callback (void *cb_data) {
        }
 
        test_user_data *user_data = (test_user_data *)cb_data;
-       user_data->callback_result = MAGIC_REMOVE;
+       user_data->callback_result = result;
 }
 
 TEST(subsession_switch_user_test, APISwitchUserTest) {
@@ -168,10 +168,10 @@ TEST(subsession_switch_user_test, APISwitchUserTest) {
 
        EXPECT_EQ(got_current_user, 2);
 
-       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);
+       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);
 }

diff --git a/libsessiond/target_test/test_hlp.hpp b/libsessiond/target_test/test_hlp.hpp
index f67bceb..ea0fb3d 100644 (file)
--- a/libsessiond/target_test/test_hlp.hpp
+++ b/libsessiond/target_test/test_hlp.hpp
@@ -147,11 +147,11 @@ 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) {
+void test_reply_callback_default (int result, void *cb_data) {
 
        test_user_data_cb_t *user_data = (test_user_data_cb_t *)cb_data;
 
-       user_data->callback_result = MAGIC_DEFAULT;
+       user_data->callback_result = result;
        g_atomic_int_inc(&user_data->callback_reference);
 }