From: Ilho Kim <ilho159.kim@samsung.com>
Date: Tue, 29 Sep 2020 01:42:55 +0000 (+0900)
Subject: Minor refactor in pkgmgr_upgrade.c
X-Git-Tag: accepted/tizen/6.0/unified/20201030.115918~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea86992ddb52be9a3b9987a7ce225a49c952fe5d;p=platform%2Fcore%2Fappfw%2Fpkgmgr-tool.git

Minor refactor in pkgmgr_upgrade.c

- Remove duplicated code
- Insert blank line for clarity

Change-Id: Ie9778d1329e418d03741948c893ce2a070f2c4fe
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---

diff --git a/src/pkg_upgrade/pkg_upgrade.c b/src/pkg_upgrade/pkg_upgrade.c
index f2274d8..679f14e 100644
--- a/src/pkg_upgrade/pkg_upgrade.c
+++ b/src/pkg_upgrade/pkg_upgrade.c
@@ -1670,6 +1670,16 @@ catch:
 	return ret;
 }
 
+static int __backup_db(const char *src_path, const char *dest_path) {
+	if (__backup_file(src_path, dest_path) != 0)
+		return -1;
+
+	if (__set_db_permission(src_path) != 0)
+		return -1;
+
+	return 0;
+}
+
 static int __make_backup_dbs() {
 	int ret = 0;
 	char parser_db_bck[BUF_SIZE];
@@ -1682,29 +1692,21 @@ static int __make_backup_dbs() {
 	snprintf(cert_db_bck, BUF_SIZE, "%s.bck", CERT_DBPATH);
 	snprintf(cert_db_journal_bck, BUF_SIZE, "%s.bck", JOURNAL_CERT_DBPATH);
 
-	tryvm_if(__backup_file(DBPATH, parser_db_bck) == -1,
+	tryvm_if(__backup_db(DBPATH, parser_db_bck) == -1,
 			ret = -1, "Fail to backup [%s] to [%s]\n",
 			DBPATH, parser_db_bck);
-	tryvm_if(__set_db_permission(DBPATH) == -1,
-			ret = -1, "Fail to set db permission\n");
 
-	tryvm_if(__backup_file(JOURNAL_DBPATH, parser_db_journal_bck) == -1,
+	tryvm_if(__backup_db(JOURNAL_DBPATH, parser_db_journal_bck) == -1,
 			ret = -1, "Fail to backup [%s] to [%s]\n",
 			JOURNAL_DBPATH, parser_db_journal_bck);
-	tryvm_if(__set_db_permission(JOURNAL_DBPATH) == -1,
-			ret = -1, "Fail to set db permission\n");
 
-	tryvm_if(__backup_file(CERT_DBPATH, cert_db_bck) == -1,
+	tryvm_if(__backup_db(CERT_DBPATH, cert_db_bck) == -1,
 			ret = -1, "Fail to backup [%s] to [%s]\n",
 			CERT_DBPATH, cert_db_bck);
-	tryvm_if(__set_db_permission(CERT_DBPATH) == -1,
-			ret = -1, "Fail to set db permission\n");
 
-	tryvm_if(__backup_file(JOURNAL_CERT_DBPATH, cert_db_journal_bck) == -1,
+	tryvm_if(__backup_db(JOURNAL_CERT_DBPATH, cert_db_journal_bck) == -1,
 			ret = -1, "Fail to backup [%s] to [%s]\n",
 			JOURNAL_CERT_DBPATH, cert_db_journal_bck);
-	tryvm_if(__set_db_permission(JOURNAL_CERT_DBPATH) == -1,
-			ret = -1, "Fail to set db permission\n");
 
 	return 0;
 
@@ -1719,6 +1721,7 @@ catch:
 
 static void __remove_backup_path(const char *origin_path) {
 	char backup_path[BUF_SIZE];
+
 	snprintf(backup_path, BUF_SIZE, "%s.bck", origin_path);
 
 	if (remove(backup_path))
@@ -1803,5 +1806,6 @@ int main(int argc, char *argv[])
 	__make_preload_rw_list(preload_rw_table);
 	g_hash_table_destroy(preload_rw_table);
 	__remove_backup_dbs();
+
 	return EXIT_SUCCESS;
 }