From 66c840eb4c048322ee6e240030f9849a0b76c16d Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Wed, 21 Jan 2015 17:01:05 +0900 Subject: [PATCH] Add visibility control set default visibility to hidden add macro to set visibility attribute Change-Id: I5b0abb9b1a11862a0189a80d55fe2dd5c859f7cf Signed-off-by: Sangyoon Jang --- CMakeLists.txt | 2 +- include/app_manager_internal.h | 4 +++ src/app_context.c | 17 ++++++------- src/app_info.c | 57 +++++++++++++++++++++--------------------- src/app_manager.c | 31 +++++++++++------------ 5 files changed, 55 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bb9488..6e032fc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fvisibility=hidden") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") diff --git a/include/app_manager_internal.h b/include/app_manager_internal.h index 81cc9c0..f428c35 100644 --- a/include/app_manager_internal.h +++ b/include/app_manager_internal.h @@ -19,6 +19,10 @@ #include "app_manager.h" +#ifndef API +#define API __attribute__ ((visibility("default"))) +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/src/app_context.c b/src/app_context.c index 23a1613..bbdc980 100755 --- a/src/app_context.c +++ b/src/app_context.c @@ -83,7 +83,6 @@ static int app_context_foreach_app_context_cb(const aul_app_info *aul_app_contex return 0; } - int app_context_foreach_app_context(app_manager_app_context_cb callback, void *user_data) { foreach_context_s foreach_context = { @@ -206,7 +205,7 @@ static int app_context_create(const char *app_id, pid_t pid, app_context_h *app_ return APP_MANAGER_ERROR_NONE; } -int app_context_destroy(app_context_h app_context) +API int app_context_destroy(app_context_h app_context) { if (app_context == NULL) { @@ -219,14 +218,14 @@ int app_context_destroy(app_context_h app_context) return APP_MANAGER_ERROR_NONE; } -int app_context_get_package(app_context_h app_context, char **package) +API int app_context_get_package(app_context_h app_context, char **package) { // TODO: this function must be deprecated return app_context_get_app_id(app_context, package); } -int app_context_get_app_id(app_context_h app_context, char **app_id) +API int app_context_get_app_id(app_context_h app_context, char **app_id) { char *app_id_dup; @@ -247,8 +246,7 @@ int app_context_get_app_id(app_context_h app_context, char **app_id) return APP_MANAGER_ERROR_NONE; } - -int app_context_get_pid(app_context_h app_context, pid_t *pid) +API int app_context_get_pid(app_context_h app_context, pid_t *pid) { if (app_context == NULL || pid == NULL) { @@ -260,7 +258,7 @@ int app_context_get_pid(app_context_h app_context, pid_t *pid) return APP_MANAGER_ERROR_NONE; } -int app_context_is_terminated(app_context_h app_context, bool *terminated) +API int app_context_is_terminated(app_context_h app_context, bool *terminated) { if (app_context == NULL || terminated == NULL) { @@ -288,7 +286,7 @@ int app_context_is_terminated(app_context_h app_context, bool *terminated) return APP_MANAGER_ERROR_NONE; } -int app_context_is_equal(app_context_h lhs, app_context_h rhs, bool *equal) +API int app_context_is_equal(app_context_h lhs, app_context_h rhs, bool *equal) { if (lhs == NULL || rhs == NULL || equal == NULL) { @@ -307,7 +305,7 @@ int app_context_is_equal(app_context_h lhs, app_context_h rhs, bool *equal) return APP_MANAGER_ERROR_NONE; } -int app_context_clone(app_context_h *clone, app_context_h app_context) +API int app_context_clone(app_context_h *clone, app_context_h app_context) { int retval; @@ -492,4 +490,3 @@ void app_context_unset_event_cb(void) app_context_unlock_event_cb_context(); } - diff --git a/src/app_info.c b/src/app_info.c index 7726f11..cdd0304 100755 --- a/src/app_info.c +++ b/src/app_info.c @@ -94,7 +94,7 @@ static int app_info_convert_bool_property(const char *property, char **converted return 0; } -int app_info_foreach_app_filter_cb(pkgmgrinfo_appinfo_h handle, void *user_data) +static int app_info_foreach_app_filter_cb(pkgmgrinfo_appinfo_h handle, void *user_data) { int retval = 0; char *appid = NULL; @@ -140,7 +140,7 @@ static int app_info_foreach_app_metadata_cb(const char *metadata_key, const char return APP_MANAGER_ERROR_NONE; } -int app_info_foreach_app_info_cb(pkgmgrinfo_appinfo_h handle, void *cb_data) +static int app_info_foreach_app_info_cb(pkgmgrinfo_appinfo_h handle, void *cb_data) { foreach_context_s *foreach_context = cb_data; app_info_h app_info = NULL; @@ -193,7 +193,7 @@ int app_info_foreach_app_info(app_manager_app_info_cb callback, void *user_data) return APP_MANAGER_ERROR_NONE; } -int app_info_create(const char *app_id, app_info_h *app_info) +API int app_info_create(const char *app_id, app_info_h *app_info) { pkgmgrinfo_pkginfo_h pkginfo = NULL; pkgmgrinfo_appinfo_h appinfo = NULL; @@ -241,7 +241,7 @@ int app_info_create(const char *app_id, app_info_h *app_info) return APP_MANAGER_ERROR_NONE; } -int app_info_destroy(app_info_h app_info) +API int app_info_destroy(app_info_h app_info) { if (app_info == NULL) { @@ -256,7 +256,7 @@ int app_info_destroy(app_info_h app_info) return APP_MANAGER_ERROR_NONE; } -int app_info_get_app_id(app_info_h app_info, char **app_id) +API int app_info_get_app_id(app_info_h app_info, char **app_id) { char *app_id_dup; @@ -277,7 +277,7 @@ int app_info_get_app_id(app_info_h app_info, char **app_id) return APP_MANAGER_ERROR_NONE; } -int app_info_get_exec(app_info_h app_info, char **exec) +API int app_info_get_exec(app_info_h app_info, char **exec) { char *val; char *app_exec_dup; @@ -304,7 +304,7 @@ int app_info_get_exec(app_info_h app_info, char **exec) return APP_MANAGER_ERROR_NONE; } -int app_info_get_label(app_info_h app_info, char **label) +API int app_info_get_label(app_info_h app_info, char **label) { char *val; char *app_label_dup; @@ -331,7 +331,7 @@ int app_info_get_label(app_info_h app_info, char **label) return APP_MANAGER_ERROR_NONE; } -int app_info_get_localed_label(const char *app_id, const char *locale, char **label) +API int app_info_get_localed_label(const char *app_id, const char *locale, char **label) { char *val; char *app_label_dup; @@ -359,7 +359,7 @@ int app_info_get_localed_label(const char *app_id, const char *locale, char **la return APP_MANAGER_ERROR_NONE; } -int app_info_get_icon(app_info_h app_info, char **path) +API int app_info_get_icon(app_info_h app_info, char **path) { char *val; char *app_icon_dup; @@ -386,7 +386,7 @@ int app_info_get_icon(app_info_h app_info, char **path) return APP_MANAGER_ERROR_NONE; } -int app_info_get_package(app_info_h app_info, char **package) +API int app_info_get_package(app_info_h app_info, char **package) { char *val; char *app_package_dup; @@ -409,8 +409,7 @@ int app_info_get_package(app_info_h app_info, char **package) return APP_MANAGER_ERROR_NONE; } - -int app_info_get_type(app_info_h app_info, char **type) +API int app_info_get_type(app_info_h app_info, char **type) { char *val; char *app_type_dup; @@ -433,7 +432,7 @@ int app_info_get_type(app_info_h app_info, char **type) return APP_MANAGER_ERROR_NONE; } -int app_info_foreach_metadata(app_info_h app_info, app_info_metadata_cb callback, void *user_data) +API int app_info_foreach_metadata(app_info_h app_info, app_info_metadata_cb callback, void *user_data) { int retval = 0; @@ -456,7 +455,7 @@ int app_info_foreach_metadata(app_info_h app_info, app_info_metadata_cb callback return APP_MANAGER_ERROR_NONE; } -int app_info_is_nodisplay(app_info_h app_info, bool *nodisplay) +API int app_info_is_nodisplay(app_info_h app_info, bool *nodisplay) { bool val; @@ -472,7 +471,7 @@ int app_info_is_nodisplay(app_info_h app_info, bool *nodisplay) return APP_MANAGER_ERROR_NONE; } -int app_info_is_enabled(app_info_h app_info, bool *enabled) +API int app_info_is_enabled(app_info_h app_info, bool *enabled) { bool val; @@ -489,7 +488,7 @@ int app_info_is_enabled(app_info_h app_info, bool *enabled) } -int app_info_is_equal(app_info_h lhs, app_info_h rhs, bool *equal) +API int app_info_is_equal(app_info_h lhs, app_info_h rhs, bool *equal) { if (lhs == NULL || rhs == NULL || equal == NULL) { @@ -508,7 +507,7 @@ int app_info_is_equal(app_info_h lhs, app_info_h rhs, bool *equal) return APP_MANAGER_ERROR_NONE; } -int app_info_is_onboot(app_info_h app_info, bool *onboot) +API int app_info_is_onboot(app_info_h app_info, bool *onboot) { bool val; @@ -526,7 +525,7 @@ int app_info_is_onboot(app_info_h app_info, bool *onboot) return APP_MANAGER_ERROR_NONE; } -int app_info_is_preload(app_info_h app_info, bool *preload) +API int app_info_is_preload(app_info_h app_info, bool *preload) { bool val; @@ -544,7 +543,7 @@ int app_info_is_preload(app_info_h app_info, bool *preload) return APP_MANAGER_ERROR_NONE; } -int app_info_clone(app_info_h *clone, app_info_h app_info) +API int app_info_clone(app_info_h *clone, app_info_h app_info) { int retval; @@ -563,7 +562,7 @@ int app_info_clone(app_info_h *clone, app_info_h app_info) return APP_MANAGER_ERROR_NONE; } -int app_info_filter_create(app_info_filter_h *handle) +API int app_info_filter_create(app_info_filter_h *handle) { int retval = 0; app_info_filter_h filter_created = NULL; @@ -593,7 +592,7 @@ int app_info_filter_create(app_info_filter_h *handle) return APP_MANAGER_ERROR_NONE; } -int app_info_filter_destroy(app_info_filter_h handle) +API int app_info_filter_destroy(app_info_filter_h handle) { int retval = 0; @@ -612,7 +611,7 @@ int app_info_filter_destroy(app_info_filter_h handle) return APP_MANAGER_ERROR_NONE; } -int app_info_filter_add_bool(app_info_filter_h handle, const char *property, const bool value) +API int app_info_filter_add_bool(app_info_filter_h handle, const char *property, const bool value) { int retval = 0; char *converted_property = NULL; @@ -637,7 +636,7 @@ int app_info_filter_add_bool(app_info_filter_h handle, const char *property, con return APP_MANAGER_ERROR_NONE; } -int app_info_filter_add_string(app_info_filter_h handle, const char *property, const char *value) +API int app_info_filter_add_string(app_info_filter_h handle, const char *property, const char *value) { int retval = 0; char *converted_property = NULL; @@ -662,7 +661,7 @@ int app_info_filter_add_string(app_info_filter_h handle, const char *property, c return APP_MANAGER_ERROR_NONE; } -int app_info_filter_count_appinfo(app_info_filter_h handle, int *count) +API int app_info_filter_count_appinfo(app_info_filter_h handle, int *count) { int retval = 0; @@ -680,7 +679,7 @@ int app_info_filter_count_appinfo(app_info_filter_h handle, int *count) return APP_MANAGER_ERROR_NONE; } -int app_info_filter_foreach_appinfo(app_info_filter_h handle, app_info_filter_cb callback, void * user_data) +API int app_info_filter_foreach_appinfo(app_info_filter_h handle, app_info_filter_cb callback, void * user_data) { int retval = 0; @@ -703,7 +702,7 @@ int app_info_filter_foreach_appinfo(app_info_filter_h handle, app_info_filter_cb return APP_MANAGER_ERROR_NONE; } -int app_info_metadata_filter_create(app_info_metadata_filter_h *handle) +API int app_info_metadata_filter_create(app_info_metadata_filter_h *handle) { int retval = 0; app_info_metadata_filter_h filter_created = NULL; @@ -733,7 +732,7 @@ int app_info_metadata_filter_create(app_info_metadata_filter_h *handle) return APP_MANAGER_ERROR_NONE; } -int app_info_metadata_filter_destroy(app_info_metadata_filter_h handle) +API int app_info_metadata_filter_destroy(app_info_metadata_filter_h handle) { int retval = 0; @@ -752,7 +751,7 @@ int app_info_metadata_filter_destroy(app_info_metadata_filter_h handle) return APP_MANAGER_ERROR_NONE; } -int app_info_metadata_filter_add(app_info_metadata_filter_h handle, const char *key, const char *value) +API int app_info_metadata_filter_add(app_info_metadata_filter_h handle, const char *key, const char *value) { int retval = 0; @@ -770,7 +769,7 @@ int app_info_metadata_filter_add(app_info_metadata_filter_h handle, const char * return APP_MANAGER_ERROR_NONE; } -int app_info_metadata_filter_foreach(app_info_metadata_filter_h handle, app_info_filter_cb callback, void *user_data) +API int app_info_metadata_filter_foreach(app_info_metadata_filter_h handle, app_info_filter_cb callback, void *user_data) { int retval = 0; diff --git a/src/app_manager.c b/src/app_manager.c index 9f90a04..11f1343 100755 --- a/src/app_manager.c +++ b/src/app_manager.c @@ -77,8 +77,7 @@ int app_manager_error(app_manager_error_e error, const char* function, const cha return error; } - -int app_manager_set_app_context_event_cb(app_manager_app_context_event_cb callback, void *user_data) +API int app_manager_set_app_context_event_cb(app_manager_app_context_event_cb callback, void *user_data) { int retval = app_context_set_event_cb(callback, user_data); @@ -92,12 +91,12 @@ int app_manager_set_app_context_event_cb(app_manager_app_context_event_cb callba } } -void app_manager_unset_app_context_event_cb(void) +API void app_manager_unset_app_context_event_cb(void) { app_context_unset_event_cb(); } -int app_manager_foreach_app_context(app_manager_app_context_cb callback, void *user_data) +API int app_manager_foreach_app_context(app_manager_app_context_cb callback, void *user_data) { int retval = app_context_foreach_app_context(callback, user_data); @@ -111,7 +110,7 @@ int app_manager_foreach_app_context(app_manager_app_context_cb callback, void *u } } -int app_manager_get_app_context(const char *app_id, app_context_h *app_context) +API int app_manager_get_app_context(const char *app_id, app_context_h *app_context) { int retval = app_context_get_app_context(app_id, app_context); @@ -125,7 +124,7 @@ int app_manager_get_app_context(const char *app_id, app_context_h *app_context) } } -int app_manager_resume_app(app_context_h app_context) +API int app_manager_resume_app(app_context_h app_context) { char *app_id; int retval; @@ -165,7 +164,7 @@ int app_manager_resume_app(app_context_h app_context) return APP_MANAGER_ERROR_NONE; } -int app_manager_foreach_app_info(app_manager_app_info_cb callback, void *user_data) +API int app_manager_foreach_app_info(app_manager_app_info_cb callback, void *user_data) { int retval; @@ -181,7 +180,7 @@ int app_manager_foreach_app_info(app_manager_app_info_cb callback, void *user_da } } -int app_manager_get_app_info(const char *app_id, app_info_h *app_info) +API int app_manager_get_app_info(const char *app_id, app_info_h *app_info) { int retval; @@ -197,7 +196,7 @@ int app_manager_get_app_info(const char *app_id, app_info_h *app_info) } } -int app_manager_get_app_id(pid_t pid, char **app_id) +API int app_manager_get_app_id(pid_t pid, char **app_id) { char buffer[256] = {0, }; char *app_id_dup = NULL; @@ -225,7 +224,7 @@ int app_manager_get_app_id(pid_t pid, char **app_id) } -int app_manager_terminate_app(app_context_h app_context) +API int app_manager_terminate_app(app_context_h app_context) { int retval; pid_t pid = 0; @@ -259,7 +258,7 @@ int app_manager_terminate_app(app_context_h app_context) return APP_MANAGER_ERROR_NONE; } -int app_manager_is_running(const char *app_id, bool *running) +API int app_manager_is_running(const char *app_id, bool *running) { if (app_id == NULL) { @@ -278,7 +277,7 @@ int app_manager_is_running(const char *app_id, bool *running) return APP_MANAGER_ERROR_NONE; } -int app_manager_open_app(const char *app_id) +API int app_manager_open_app(const char *app_id) { int retval; retval = aul_open_app(app_id); @@ -306,7 +305,7 @@ int app_manager_open_app(const char *app_id) return APP_MANAGER_ERROR_NONE; } -int app_manager_get_shared_data_path(const char *app_id, char **path) +API int app_manager_get_shared_data_path(const char *app_id, char **path) { int r; int retval = aul_get_app_shared_data_path_by_appid(app_id, path); @@ -332,7 +331,7 @@ int app_manager_get_shared_data_path(const char *app_id, char **path) return r; } -int app_manager_get_shared_resource_path(const char *app_id, char **path) +API int app_manager_get_shared_resource_path(const char *app_id, char **path) { int r; int retval = aul_get_app_shared_resource_path_by_appid(app_id, path); @@ -358,7 +357,7 @@ int app_manager_get_shared_resource_path(const char *app_id, char **path) return r; } -int app_manager_get_shared_trusted_path(const char *app_id, char **path) +API int app_manager_get_shared_trusted_path(const char *app_id, char **path) { int r; int retval = aul_get_app_shared_trusted_path_by_appid(app_id, path); @@ -384,7 +383,7 @@ int app_manager_get_shared_trusted_path(const char *app_id, char **path) return r; } -int app_manager_get_external_shared_data_path(const char *app_id, char **path) +API int app_manager_get_external_shared_data_path(const char *app_id, char **path) { int r; int retval = aul_get_app_external_shared_data_path_by_appid(app_id, path); -- 2.7.4