Fix db recovery tools 95/222395/1
authorHwankyu Jhun <h.jhun@samsung.com>
Tue, 14 Jan 2020 09:51:55 +0000 (18:51 +0900)
committerHwankyu Jhun <h.jhun@samsung.com>
Tue, 14 Jan 2020 09:51:55 +0000 (18:51 +0900)
- Fix return value

Change-Id: Ic859cf677ee50822a2ad37783a21cfb153dc1269
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
tool/recovery/appsvc_db_recovery.c
tool/recovery/component_db_recovery.c

index d28a073..abfb1f1 100644 (file)
@@ -73,7 +73,7 @@ static int __check_db_integrity(uid_t uid)
 
        db_path = aul_db_get_path(".appsvc.db", uid);
        if (!db_path) {
-               _E("Failed to get db path");
+               fprintf(stderr, "Failed to get appsvc db path\n");
                return -1;
        }
 
@@ -85,13 +85,14 @@ static int __check_db_integrity(uid_t uid)
 
        ret = aul_db_recovery(db_path, QUERY_CREATE_APPSVC, uid);
        if (ret != 0) {
-               printf("Failed to recovery %s\n", db_path);
+               fprintf(stderr, "Failed to recovery %s\n", db_path);
                free(db_path);
                return -1;
        }
        free(db_path);
 
-       return 0;
+       printf("appsvc DB recovery process done\n");
+       return 1;
 }
 
 int main(int argc, char **argv)
@@ -104,14 +105,12 @@ int main(int argc, char **argv)
        }
 
        ret = __check_db_integrity(tzplatform_getuid(TZ_SYS_GLOBALAPP_USER));
-       if (ret != 0)
+       if (ret < 0)
                return -1;
 
        ret = __check_db_integrity(tzplatform_getuid(TZ_SYS_DEFAULT_USER));
-       if (ret != 0)
+       if (ret < 0)
                return -1;
 
-       printf("appsvc DB recovery process done\n");
-
-       return 0;
+       return ret;
 }
index 86f49cb..c9d7b68 100644 (file)
@@ -58,7 +58,7 @@ static int __check_db_integrity(uid_t uid)
 
        db_path = aul_db_get_path(".component.db", uid);
        if (!db_path) {
-               _E("Failed to get db path");
+               fprintf(stderr, "Failed to get component db path\n");
                return -1;
        }
 
@@ -70,14 +70,14 @@ static int __check_db_integrity(uid_t uid)
 
        ret = aul_db_recovery(db_path, QUERY_CREATE_COMPONENT, uid);
        if (ret != 0) {
-               printf("Failed to recovery %s\n", db_path);
+               fprintf(stderr, "Failed to recovery %s\n", db_path);
                free(db_path);
                return -1;
        }
-
        free(db_path);
 
-       return 0;
+       printf("component DB recovery process done\n");
+       return 1;
 }
 
 int main(int argc, char **argv)
@@ -90,14 +90,12 @@ int main(int argc, char **argv)
        }
 
        ret = __check_db_integrity(tzplatform_getuid(TZ_SYS_GLOBALAPP_USER));
-       if (ret != 0)
+       if (ret < 0)
                return -1;
 
        ret = __check_db_integrity(tzplatform_getuid(TZ_SYS_DEFAULT_USER));
-       if (ret != 0)
+       if (ret < 0)
                return -1;
 
-       printf("component DB recovery process done\n");
-
-       return 0;
+       return ret;
 }