lib: Ensure public functions are prefixed with subsession_

Get rid of unprefixed types like `reply_callback` and similar - these
are likely to cause conflicts with other programs.

Change-Id: I2e0e814ad25cd187811e4e9d2af710035f51df36

diff --git a/libsessiond/include/sessiond.h b/libsessiond/include/sessiond.h
index 2abea12ddce2cbb6a67e591c6916c434e99875d1..5d3471101186712be94d91e3054ff48d70582cbd 100644 (file)
--- a/libsessiond/include/sessiond.h
+++ b/libsessiond/include/sessiond.h
@@ -28,32 +28,25 @@ extern "C" {
 #include <stdint.h>
 #include <tizen.h>
 
-typedef  int (*reply_callback) (int result, void *cb_data);
-int subsession_add_user(int session_uid, int user, reply_callback cb, void *cb_data);
-int subsession_remove_user(int session_uid, int user, reply_callback cb, void *cb_data);
-int subsession_switch_user(int session_uid, int prev_user, int next_user, reply_callback cb, void *cb_data);
+typedef int (*subsession_reply_callback) (int result, void *cb_data);
+int subsession_add_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data);
+int subsession_remove_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data);
+int subsession_switch_user(int session_uid, int prev_user, int next_user, subsession_reply_callback cb, void *cb_data);
 
-//Amd →(REGISTER WAIT CALLBACK)→ Sessiond
-//Amd ←(SIGNAL BROADCAST)← Sessiond
-//Amd →(WAIT DONE)→ Sessiond
-
-typedef  int (*add_user_wait_callback) (int session_uid, int user, void *cb_data);
-int subsession_add_user_wait_callback(int session_uid, add_user_wait_callback cb, void *cb_data);
+typedef int (*subsession_add_user_wait_callback) (int session_uid, int user, void *cb_data);
+int subsession_add_user_wait(int session_uid, subsession_add_user_wait_callback cb, void *cb_data);
 int subsession_add_user_wait_done(int session_uid, int user);
 
-typedef int (*remove_user_wait_callback) (int session_uid, int user, void *cb_data);
-int subsession_remove_user_wait_callback(int session_uid, remove_user_wait_callback cb, void *cb_data);
+typedef int (*subsession_remove_user_wait_callback) (int session_uid, int user, void *cb_data);
+int subsession_remove_user_wait(int session_uid, subsession_remove_user_wait_callback cb, void *cb_data);
 int subsession_remove_user_wait_done(int session_uid, int user);
 
-typedef int (*switch_wait_callback) (int session_uid, uint64_t switch_id, int prev_user, int next_user, void *cb_data);
-int subsession_switch_wait_callback(int session_uid, switch_wait_callback cb, void *cb_data);
+typedef int (*subsession_switch_wait_callback) (int session_uid, uint64_t switch_id, int prev_user, int next_user, void *cb_data);
+int subsession_switch_wait(int session_uid, subsession_switch_wait_callback cb, void *cb_data);
 int subsession_switch_wait_done(int session_uid, uint64_t switch_id);
-//Amd →(CALL)→ Sessiond
-
-typedef int (*switch_completion_callback)(int session_uid, int prev_user, int next_user, uint64_t switch_id);
-int subsession_switch_completion_callback(int session_uid, switch_completion_callback cb, void *cb_data);
-//new
 
+typedef int (*subsession_switch_completion_callback)(int session_uid, int prev_user, int next_user, uint64_t switch_id);
+int subsession_switch_completion(int session_uid, subsession_switch_completion_callback cb, void *cb_data);
 
 int subsession_get_user_list(int session_uid, int **user_list, int *user_count);
 int subsession_get_current_user(int session_uid, int *user);

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index 66c4b025a7c6e325826eeb7998860e15c53553aa..bdbc083794f70849211884d17cc1f587f5278b95 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -176,7 +176,7 @@ static void signal_add_user_complete_handler(
                return ;
        }
 
-       reply_callback reply_cb = signal_data->client_callback;
+       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);
@@ -218,7 +218,7 @@ static void signal_remove_user_complete_handler(
                return ;
        }
 
-       reply_callback reply_cb = signal_data->client_callback;
+       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);
@@ -294,7 +294,7 @@ static void signal_switch_user_complete_handler(
                return ;
        }
 
-       reply_callback reply_cb = signal_data->client_callback;
+       subsession_reply_callback reply_cb = signal_data->client_callback;
 
        void *client_callback_data = signal_data->client_callback_data;
        reply_cb(ret_code, client_callback_data);
@@ -315,7 +315,7 @@ static void signal_add_user_started_callback(GDBusConnection *connection,
 
        signal_client_data_t *signal_data = (signal_client_data_t *)client_data;
 
-       add_user_wait_callback add_user_wait_cb = signal_data->client_callback;
+       subsession_add_user_wait_callback add_user_wait_cb = signal_data->client_callback;
 
        int ret_session_uid = 0;
        int ret_user_id = 0;
@@ -352,7 +352,7 @@ static void signal_remove_user_started_callback(GDBusConnection *connection,
 
        signal_client_data_t *signal_data = (signal_client_data_t *)client_data;
 
-       remove_user_wait_callback remove_user_wait_cb = signal_data->client_callback;
+       subsession_remove_user_wait_callback remove_user_wait_cb = signal_data->client_callback;
 
        int ret_session_uid = 0;
        int ret_user_id = 0;
@@ -527,7 +527,7 @@ int method_call_no_signal(gchar *method, GVariant *params) {
        return 0;
 }
 
-int subsession_add_user(int session_uid, int user, reply_callback cb, void *cb_data) {
+int subsession_add_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data) {
 
        g_mutex_lock (&add_user_mutex);
 
@@ -553,7 +553,7 @@ int subsession_add_user(int session_uid, int user, reply_callback cb, void *cb_d
                signal_add_user_complete_handler);
 }
 
-int subsession_remove_user(int session_uid, int user, reply_callback cb, void *cb_data) {
+int subsession_remove_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data) {
 
        g_mutex_lock (&remove_user_mutex);
 
@@ -580,7 +580,7 @@ int subsession_remove_user(int session_uid, int user, reply_callback cb, void *c
 
 }
 
-int subsession_switch_user(int session_uid, int prev_user, int next_user, reply_callback cb, void *cb_data) {
+int subsession_switch_user(int session_uid, int prev_user, int next_user, subsession_reply_callback cb, void *cb_data) {
 
 
        g_mutex_lock (&switch_user_mutex);
@@ -613,7 +613,7 @@ int subsession_switch_user(int session_uid, int prev_user, int next_user, reply_
 //Amd ←(SIGNAL BROADCAST)← Sessiond
 //Amd →(WAIT DONE)→ Sessiond
 
-int subsession_add_user_wait_callback(int session_uid, add_user_wait_callback cb, void *cb_data) {
+int subsession_add_user_wait(int session_uid, subsession_add_user_wait_callback cb, void *cb_data) {
 
 
        GVariant * params;
@@ -637,7 +637,7 @@ int subsession_add_user_wait_done(int session_uid, int user) {
        return TIZEN_ERROR_ACCOUNT;
 }
 
-int subsession_remove_user_wait_callback(int session_uid, remove_user_wait_callback cb, void *cb_data) {
+int subsession_remove_user_wait(int session_uid, subsession_remove_user_wait_callback cb, void *cb_data) {
 
        GVariant * params;
        params = g_variant_new("(i)", session_uid);
@@ -660,7 +660,7 @@ int subsession_remove_user_wait_done(int session_uid, int user) {
        return TIZEN_ERROR_ACCOUNT;
 }
 
-int subsession_switch_wait_callback(int session_uid, switch_wait_callback cb, void *cb_data) {
+int subsession_switch_wait(int session_uid, subsession_switch_wait_callback cb, void *cb_data) {
 
        return TIZEN_ERROR_ACCOUNT;
 }
@@ -671,7 +671,7 @@ int subsession_switch_wait_done(int session_uid, uint64_t switch_id) {
 }
 
 
-int subsession_switch_completion_callback(int session_uid, switch_completion_callback cb, void *cb_data) {
+int subsession_switch_completion(int session_uid, subsession_switch_completion_callback cb, void *cb_data) {
 
 
        return TIZEN_ERROR_ACCOUNT;

diff --git a/libsessiond/target_test/test_api_add_remove_user_wait.cpp b/libsessiond/target_test/test_api_add_remove_user_wait.cpp
index fc59a0e41f2ec6f6ac8c83d9af3763cc9f7afa1b..0a9e2f8488b7a698033ef30eb6145cc351d2cfe0 100644 (file)
--- a/libsessiond/target_test/test_api_add_remove_user_wait.cpp
+++ b/libsessiond/target_test/test_api_add_remove_user_wait.cpp
@@ -87,9 +87,9 @@ int test_reply_removeuser_callback (int result, void *cb_data) {
 
        return 0;
 }
-typedef  int (*add_user_wait_callback) (int session_uid, int user, void *cb_data);
+typedef  int (*subsession_add_user_wait_callback) (int session_uid, int user, void *cb_data);
 
-int test_add_user_wait_callback(int session_uid, int user, void *cb_data) {
+int test_subsession_add_user_wait_callback(int session_uid, int user, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduserstarted_reference);
 
@@ -121,7 +121,7 @@ int test_add_user_wait_callback(int session_uid, int user, void *cb_data) {
 }
 
 
-int test_remove_user_wait_callback(int session_uid, int user, void *cb_data) {
+int test_subsession_remove_user_wait_callback(int session_uid, int user, void *cb_data) {
 
        g_atomic_int_inc(&callback_removeuserstarted_reference);
 
@@ -166,8 +166,8 @@ TEST(subsession_add_remove_user_wait_test, APIAddRemoveUserWaitTest) {
        test_add_wait_1_2.session_id = 1;
        test_add_wait_1_2.user_id = -3;
        test_add_wait_1_2.callback_result = -1;
-       int add_user_wait_res_1_2 = subsession_add_user_wait_callback(test_add_wait_1_2.session_id,
-                test_add_user_wait_callback, (void *)&test_add_wait_1_2);
+       int add_user_wait_res_1_2 = subsession_add_user_wait(test_add_wait_1_2.session_id,
+                test_subsession_add_user_wait_callback, (void *)&test_add_wait_1_2);
 
        test_user_data test_add_1_2;
        test_add_1_2.session_id = 1;
@@ -181,8 +181,8 @@ TEST(subsession_add_remove_user_wait_test, APIAddRemoveUserWaitTest) {
        test_remove_wait_1_2.session_id = 1;
        test_remove_wait_1_2.user_id = -3;
        test_remove_wait_1_2.callback_result = -1;
-       int remove_user_wait_res_1_2 = subsession_remove_user_wait_callback(test_add_wait_1_2.session_id,
-                test_remove_user_wait_callback, (void *)&test_remove_wait_1_2);
+       int remove_user_wait_res_1_2 = subsession_remove_user_wait(test_add_wait_1_2.session_id,
+                test_subsession_remove_user_wait_callback, (void *)&test_remove_wait_1_2);
 
        test_user_data test_remove_1_2;
        test_remove_1_2.session_id = 1;

diff --git a/libsessiond/target_test/test_api_adduser.cpp b/libsessiond/target_test/test_api_adduser.cpp
index ebc9085bd944840124d5e64b6d893e0ba8c4b200..1755f01c6d09acc1fd5be79ab090a3343bbfecfa 100644 (file)
--- a/libsessiond/target_test/test_api_adduser.cpp
+++ b/libsessiond/target_test/test_api_adduser.cpp
@@ -34,7 +34,7 @@ gboolean callback_pending(gpointer data) {
   return TRUE;
 }
 
-int test_reply_callback (int result, void *cb_data) {
+int test_subsession_reply_callback (int result, void *cb_data) {
 
        g_atomic_int_set(&callback_pending_reference, 1);
 
@@ -61,7 +61,7 @@ TEST(subsession_add_user_test, APIAddUserTest) {
        test_user_data test_ud;
        test_ud.callback_result = -1;
 
-       int add_user_res = subsession_add_user(1, 2, test_reply_callback, (void *)&test_ud);
+       int add_user_res = subsession_add_user(1, 2, test_subsession_reply_callback, (void *)&test_ud);
 
        ud_ctrl ud;
        ud.loop = loop;

diff --git a/libsessiond/target_test/test_api_adduserwait.cpp b/libsessiond/target_test/test_api_adduserwait.cpp
index d01f542257a58a3aec370b3e19356accc406552e..64cb58eb0358b11c2a9c1dbbf1cb470d0023119b 100644 (file)
--- a/libsessiond/target_test/test_api_adduserwait.cpp
+++ b/libsessiond/target_test/test_api_adduserwait.cpp
@@ -85,9 +85,9 @@ int test_reply_removeuser_callback (int result, void *cb_data) {
 
        return 0;
 }
-typedef  int (*add_user_wait_callback) (int session_uid, int user, void *cb_data);
+typedef  int (*subsession_add_user_wait_callback) (int session_uid, int user, void *cb_data);
 
-int test_add_user_wait_callback(int session_uid, int user, void *cb_data) {
+int test_subsession_add_user_wait_callback(int session_uid, int user, void *cb_data) {
 
        g_atomic_int_inc(&callback_adduserstarted_reference);
 
@@ -113,7 +113,7 @@ int test_add_user_wait_callback(int session_uid, int user, void *cb_data) {
                return result;
        }
        user_data->user_id = user;
-       user_data->callback_result =subsession_add_user_wait_done(session_uid, user);
+       user_data->callback_result = subsession_add_user_wait_done(session_uid, user);
 
        return result;
 }
@@ -131,8 +131,8 @@ TEST(subsession_add_user_wait_test, APIAddUserWaitTest) {
        test_add_wait_1_2.session_id = 1;
        test_add_wait_1_2.user_id = -3;
        test_add_wait_1_2.callback_result = -1;
-       int add_user_wait_res_1_2 = subsession_add_user_wait_callback(test_add_wait_1_2.session_id,
-                test_add_user_wait_callback, (void *)&test_add_wait_1_2);
+       int add_user_wait_res_1_2 = subsession_add_user_wait(test_add_wait_1_2.session_id,
+                test_subsession_add_user_wait_callback, (void *)&test_add_wait_1_2);
 
        test_user_data test_add_1_2;
        test_add_1_2.session_id = 1;

diff --git a/libsessiond/target_test/test_api_removeuser.cpp b/libsessiond/target_test/test_api_removeuser.cpp
index b67d2f5284109245a4ac1b0b8c444a857f99a524..d2a61e986e007462dd1139d272370fe0aaa0846a 100644 (file)
--- a/libsessiond/target_test/test_api_removeuser.cpp
+++ b/libsessiond/target_test/test_api_removeuser.cpp
@@ -34,7 +34,7 @@ gboolean callback_pending(gpointer data) {
   return TRUE;
 }
 
-int test_reply_callback (int result, void *cb_data) {
+int test_subsession_reply_callback (int result, void *cb_data) {
 
        g_atomic_int_inc(&callback_pending_reference);
 
@@ -61,7 +61,7 @@ TEST(subsession_remove_user_test, APIRemoveUserTest) {
        test_user_data test_ud;
        test_ud.callback_result = -1;
 
-       int add_user_res = subsession_remove_user(1, 2, test_reply_callback, (void *)&test_ud);
+       int add_user_res = subsession_remove_user(1, 2, test_subsession_reply_callback, (void *)&test_ud);
 
        ud_ctrl ud;
        ud.loop = loop;