Fix build errors from toolchain upgrade (gcc & iniparser)

Change-Id: I86b18f1d24b9aa5ce2515df8c4f58f2e740257d8
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/capi/include/privilege_info_types.h b/capi/include/privilege_info_types.h
index e4f3945b3de8a643559ed77f9eb929dda4943539..e49bbc7e95d5b77240bb632ada992a7209ec9b85 100644 (file)
--- a/capi/include/privilege_info_types.h
+++ b/capi/include/privilege_info_types.h
@@ -47,7 +47,7 @@ typedef struct {
        void* user_data;
 } privilege_list_cb_data;
 
-static const privilege_group_info_s const privilege_group_info_table[MAX_PRV_GROUP] = {
+static const privilege_group_info_s privilege_group_info_table[MAX_PRV_GROUP] = {
        {"http://tizen.org/privilege/group/group0", _PRV_GROUP_0, "IDS_TPLATFORM_BODY_HARDWARE_CONTROLS_ABB"},
        {"http://tizen.org/privilege/group/group1", _PRV_GROUP_1, "IDS_TPLATFORM_OPT_LOCATION_T_LBS"},
        {"http://tizen.org/privilege/group/group2", _PRV_GROUP_2, "IDS_TPLATFORM_BODY_NETWORK_CONNECTIONS_ABB"},

diff --git a/capi/src/privilege_db_manager.c b/capi/src/privilege_db_manager.c
index 8e7fce73faf45780ef1e97d1bd7ffeda2e072ecb..53c805bb31f4426a7f91ab16433a82415f3011f7 100755 (executable)
--- a/capi/src/privilege_db_manager.c
+++ b/capi/src/privilege_db_manager.c
@@ -53,7 +53,6 @@ privilege_profile_type_e get_priv_profile()
        static privilege_profile_type_e saved = 0xff;
 
        if (__builtin_expect(saved == 0xff, 0)) {
-               char *val = NULL;
                dictionary *dic = iniparser_load(INI_PATH);
 
                if (dic == NULL) {
@@ -62,7 +61,7 @@ privilege_profile_type_e get_priv_profile()
                        return saved;
                }
 
-               val = iniparser_getstring(dic, INI_KEYWORD_PROFILE, NULL);
+               const char* val = iniparser_getstring(dic, INI_KEYWORD_PROFILE, NULL);
 
                if (val != NULL) {
                        switch (*val) {
@@ -118,11 +117,13 @@ int __initialize_db(privilege_db_type_e type, sqlite3 ** db)
                break;
        case PRIVILEGE_DB_TYPE_POLICY_RW:
                db_mode = SQLITE_OPEN_READWRITE;
+               __attribute__ ((fallthrough));
        case PRIVILEGE_DB_TYPE_POLICY_RO:
                db_path = PRIVILEGE_POLICY_DB_PATH;
                break;
        case PRIVILEGE_DB_TYPE_PRIVACY_RW:
                db_mode = SQLITE_OPEN_READWRITE;
+               __attribute__ ((fallthrough));
        case PRIVILEGE_DB_TYPE_PRIVACY_RO:
                db_path = PRIVILEGE_PRIVACY_DB_PATH;
                break;

diff --git a/capi/src/privilege_manager.c b/capi/src/privilege_manager.c
index 373abc5dd8da35725196235009784ba765cf77d5..c8e22c99e4c97032b009220a83537358488ff25b 100755 (executable)
--- a/capi/src/privilege_manager.c
+++ b/capi/src/privilege_manager.c
@@ -45,6 +45,8 @@
 #define _LOGI(fmt, arg...)
 #endif
 
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+
 #define TryReturn(condition, expr, returnValue, ...)\
        if (!(condition)) { \
                _LOGE(__VA_ARGS__); \
@@ -128,7 +130,8 @@ static const char *__get_privilege_level_string(privilege_manager_visibility_e v
        case PRVMGR_PACKAGE_VISIBILITY_PLATFORM:
                return "platform";
        default:
-               return NULL;
+               _LOGE("__get_package_type_string() failed. No matched privilege level string.");
+               return "";
        }
 }
 
@@ -142,7 +145,8 @@ const char *__get_package_type_string(privilege_manager_package_type_e type)
        case PRVMGR_PACKAGE_TYPE_METADATA:
                return "Metadata";
        default:
-               return NULL;
+               _LOGE("__get_package_type_string() failed. No matched package type string.");
+               return "";
        }
 }