From: Mateusz Majewski Date: Fri, 15 Jul 2022 08:16:30 +0000 (+0200) Subject: Add static where appropriate X-Git-Tag: submit/tizen/20220715.132635~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4473c52db7e14eb8ef8c63752cea2309abdb96be;p=platform%2Fcore%2Fsystem%2Fsessiond.git Add static where appropriate Change-Id: Ic3027ddecbbefd4696ddf0636407c5d4f7a2ae17 --- diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c index 78ed54e..f73864f 100644 --- a/libsessiond/src/lib.c +++ b/libsessiond/src/lib.c @@ -34,7 +34,7 @@ const int libsessiond_default_timeout = 20000; -session_connection_data_t session_connection_data = { +static session_connection_data_t session_connection_data = { .connection = NULL, .bus_name = "org.tizen.sessiond", .objpath = "/org/tizen/sessiond", @@ -88,25 +88,25 @@ typedef struct { guint dbus_signal_subscribed; } client_callbacks_data_t; -client_callbacks_data_t add_user_wait_callbacks_data_mt = { +static client_callbacks_data_t add_user_wait_callbacks_data_mt = { .list = NULL, .dbus_method_call = "AddUserWait", .dbus_signal = "AddUserStarted" }; -client_callbacks_data_t remove_user_wait_callbacks_data_mt = { +static client_callbacks_data_t remove_user_wait_callbacks_data_mt = { .list = NULL, .dbus_method_call = "RemoveUserWait", .dbus_signal = "RemoveUserStarted" }; -client_callbacks_data_t switch_user_wait_callbacks_data_mt = { +static client_callbacks_data_t switch_user_wait_callbacks_data_mt = { .list = NULL, .dbus_method_call = "SwitchUserWait", .dbus_signal = "SwitchUserStarted" }; -client_callbacks_data_t switch_user_completion_callbacks_data_mt = { +static client_callbacks_data_t switch_user_completion_callbacks_data_mt = { .list = NULL, .dbus_signal = "SwitchUserCompleted" }; @@ -124,7 +124,7 @@ typedef struct { } reply_client_data_t; -int is_user_id_null(const char *user_id) { +static int is_user_id_null(const char *user_id) { if(user_id == NULL) { LOGE("user_id is NULL"); return TRUE; @@ -133,7 +133,7 @@ int is_user_id_null(const char *user_id) { } -int has_added_user_correct_length(const char *user_id) { +static int has_added_user_correct_length(const char *user_id) { if(strnlen(user_id, SUBSESSION_USER_MAXLEN) > SUBSESSION_USER_MAXLEN-1) { LOGE("user_id length:%lu > SUBSESSION_USER_MAXLEN", strnlen(user_id, SUBSESSION_USER_MAXLEN) ); @@ -148,7 +148,7 @@ int has_added_user_correct_length(const char *user_id) { return FALSE; } -int has_dot_first_in_name(const char *user_id) { +static int has_dot_first_in_name(const char *user_id) { if(user_id[0] == '.') { LOGE("user_id starts with '.'"); return TRUE; @@ -156,7 +156,7 @@ int has_dot_first_in_name(const char *user_id) { return FALSE; } -int is_not_correct_name(const char *user_id) { +static int is_not_correct_name(const char *user_id) { for (size_t i = 0; i < (strnlen(user_id, SUBSESSION_USER_MAXLEN)); ++i) { if (strchr(user_id, '/')) { LOGE("user_id contains: /"); @@ -166,7 +166,7 @@ int is_not_correct_name(const char *user_id) { return FALSE; } -gboolean error_on_bad_user_id(const char *user_id) { +static gboolean error_on_bad_user_id(const char *user_id) { return ( is_user_id_null(user_id) || has_added_user_correct_length(user_id) @@ -175,7 +175,7 @@ gboolean error_on_bad_user_id(const char *user_id) { ); } -int has_switched_user_correct_length(const char *user_id) { +static int has_switched_user_correct_length(const char *user_id) { if (strnlen(user_id, SUBSESSION_USER_MAXLEN) > SUBSESSION_USER_MAXLEN-1) { LOGE("user_id length:%lu > SUBSESSION_USER_MAXLEN", strnlen(user_id, SUBSESSION_USER_MAXLEN) ); @@ -188,7 +188,7 @@ int has_switched_user_correct_length(const char *user_id) { return FALSE; } -gboolean error_on_switch_bad_user_id(const char *user_id) { +static gboolean error_on_switch_bad_user_id(const char *user_id) { return ( is_user_id_null(user_id) || has_switched_user_correct_length(user_id) @@ -857,7 +857,7 @@ typedef struct { } registered_signal_t; -registered_signal_t subsession_register_event_in_list(client_callbacks_data_t *callbacks_data, GVariant *init_params, GVariant *params, subsession_event_callback cb, void *cb_data) { +static registered_signal_t subsession_register_event_in_list(client_callbacks_data_t *callbacks_data, GVariant *init_params, GVariant *params, subsession_event_callback cb, void *cb_data) { registered_signal_t registered_signal = {0}; @@ -909,7 +909,7 @@ registered_signal_t subsession_register_event_in_list(client_callbacks_data_t *c callbacks_data_mt->dbus_signal, \ &callbacks_data_mt->dbus_signal_subscribed -int register_event_callback(client_callbacks_data_t *callbacks_data, GDBusSignalCallback signal_callback, int session_uid, subsession_event_callback cb, void * cb_data) { +static int register_event_callback(client_callbacks_data_t *callbacks_data, GDBusSignalCallback signal_callback, int session_uid, subsession_event_callback cb, void *cb_data) { return_if( signal_callback_is_null(signal_callback, @@ -946,7 +946,7 @@ int register_event_callback(client_callbacks_data_t *callbacks_data, GDBusSignal return method_call_result; } -int subscribe_only_callback(client_callbacks_data_t *callbacks_data, GDBusSignalCallback signal_callback, int session_uid, subsession_event_callback cb, void * cb_data) { +static int subscribe_only_callback(client_callbacks_data_t *callbacks_data, GDBusSignalCallback signal_callback, int session_uid, subsession_event_callback cb, void *cb_data) { GVariant * params = g_variant_new("(i)", session_uid); @@ -994,7 +994,7 @@ EXPORT_API int subsession_register_event_callback(int session_uid, subsession_ev return SUBSESSION_ERROR_NONE; } -int unregister_event_callback(client_callbacks_data_t *callbacks_data, int session_uid) { +static int unregister_event_callback(client_callbacks_data_t *callbacks_data, int session_uid) { return_if( callbacks_data_are_null(callbacks_data, @@ -1039,19 +1039,19 @@ EXPORT_API int subsession_unregister_event_callback(int session_uid, subsession_ return SUBSESSION_ERROR_NONE; } -int subsession_add_user_wait_done(int session_uid, subsession_user_t user) { +static int subsession_add_user_wait_done(int session_uid, subsession_user_t user) { GVariant * params = g_variant_new("(is)", session_uid, user); return_with_log_error_result_(method_call_no_signal(dbus_method_call.AddUserDone, params)); } -int subsession_remove_user_wait_done(int session_uid,subsession_user_t user) { +static int subsession_remove_user_wait_done(int session_uid,subsession_user_t user) { GVariant * params = g_variant_new("(is)", session_uid, user); return_with_log_error_result_(method_call_no_signal(dbus_method_call.RemoveUserDone, params)); } -int subsession_switch_wait_done(int session_uid, uint64_t switch_id) { +static int subsession_switch_wait_done(int session_uid, uint64_t switch_id) { GVariant * params = g_variant_new("(ix)", session_uid, (gint64)switch_id); return_with_log_error_result_(method_call_no_signal(dbus_method_call.SwitchUserDone, params));