Fix Prevent and remove compile warning messages

[platform/core/appfw/ail.git] / tool / src / initdb_user.c

diff --git a/tool/src/initdb_user.c b/tool/src/initdb_user.c
index 4aae135..5de4b8c 100755 (executable)
--- a/tool/src/initdb_user.c
+++ b/tool/src/initdb_user.c
@@ -37,16 +37,20 @@
 #ifdef _E
 #undef _E
 #endif
-#define _E(fmt, arg...) fprintf(stderr, "[AIL_INITDB][E][%s,%d] "fmt"\n", __FUNCTION__, __LINE__, ##arg);
+#define _E(fmt, arg...) fprintf(stderr, "[AIL_INITDB][E][%s,%d] "fmt"\n", __FUNCTION__, __LINE__, ##arg)
 
 #ifdef _D
 #undef _D
 #endif
-#define _D(fmt, arg...) fprintf(stderr, "[AIL_INITDB][D][%s,%d] "fmt"\n", __FUNCTION__, __LINE__, ##arg);
+#define _D(fmt, arg...) fprintf(stderr, "[AIL_INITDB][D][%s,%d] "fmt"\n", __FUNCTION__, __LINE__, ##arg)
 
 #define SET_DEFAULT_LABEL(x) \
-       if(smack_setlabel((x), "*", SMACK_LABEL_ACCESS)) _E("failed chsmack -a \"*\" %s", x) \
-       else _D("chsmack -a \"*\" %s", x)
+       do { \
+               if (smack_setlabel((x), "*", SMACK_LABEL_ACCESS)) \
+                       _E("failed chsmack -a \"*\" %s", x); \
+               else \
+                       _D("chsmack -a \"*\" %s", x); \
+       } while (0)
 
 static int initdb_user_count_app(void)
 {
@@ -55,9 +59,8 @@ static int initdb_user_count_app(void)
        int total = 0;
 
        ret = ail_filter_new(&filter);
-       if (ret != AIL_ERROR_OK) {
+       if (ret != AIL_ERROR_OK)
                return -1;
-       }
 
        ret = ail_filter_add_bool(filter, AIL_PROP_NODISPLAY_BOOL, false);
        if (ret != AIL_ERROR_OK) {
@@ -75,9 +78,7 @@ static int initdb_user_count_app(void)
        return total;
 }
 
-
-
-char* _desktop_to_package(const char* desktop)
+char *_desktop_to_package(const char* desktop)
 {
        char *package, *tmp;
 
@@ -87,7 +88,7 @@ char* _desktop_to_package(const char* desktop)
        retv_if(!package, NULL);
 
        tmp = strrchr(package, '.');
-       if(tmp == NULL) {
+       if (tmp == NULL) {
                _E("[%s] is not a desktop file", package);
                free(package);
                return NULL;
@@ -104,18 +105,16 @@ char* _desktop_to_package(const char* desktop)
        return package;
 }
 
-
-
 int initdb_user_load_directory(const char *directory)
 {
        DIR *dir;
        struct dirent entry, *result;
-       int len, ret;
+       int ret;
        char buf[BUFSZE];
        int total_cnt = 0;
        int ok_cnt = 0;
 
-       // desktop file
+       /* desktop file */
        dir = opendir(directory);
        if (!dir) {
                if (strerror_r(errno, buf, sizeof(buf)) == 0)
@@ -123,7 +122,6 @@ int initdb_user_load_directory(const char *directory)
                return AIL_ERROR_FAIL;
        }
 
-       len = strlen(directory) + 1;
        _D("Loading desktop files from %s", directory);
 
        for (ret = readdir_r(dir, &entry, &result);
@@ -139,11 +137,11 @@ int initdb_user_load_directory(const char *directory)
                        continue;
                }
 
-               if (ail_usr_desktop_add(package, getuid()) != AIL_ERROR_OK) {
+               if (ail_usr_desktop_add(package, getuid()) != AIL_ERROR_OK)
                        _E("Failed to add a package[%s]", package);
-               } else {
+               else
                        ok_cnt++;
-               }
+
                free(package);
        }