Modified function name for readability (#263)

Change-Id: Ia573149eb300989156a941427f8007c17514627b

diff --git a/NativeLauncher/inc/db_manager.h b/NativeLauncher/inc/db_manager.h
index 5683ca2..41f07ed 100644 (file)
--- a/NativeLauncher/inc/db_manager.h
+++ b/NativeLauncher/inc/db_manager.h
@@ -32,13 +32,13 @@
                        PKGID           TEXT,\
                        LIBRARY         TEXT);"
 
-sqlite3* dbCreate(std::string path, std::string query);
-sqlite3* dbOpen(std::string path);
-void dbClose(sqlite3 *tac_db);
-void dbRollback(sqlite3 *tac_db);
-bool dbUpdate(sqlite3 *tac_db, std::string query);
-bool dbInsert(sqlite3 *tac_db, std::string query);
-bool dbDelete(sqlite3 *tac_db, std::string query);
-std::vector<std::string> dbSelect(sqlite3 *tac_db, std::string query);
+sqlite3* createDB(std::string path, std::string query);
+sqlite3* openDB(std::string path);
+void closeDB(sqlite3 *tac_db);
+void rollbackDB(sqlite3 *tac_db);
+bool updateDB(sqlite3 *tac_db, std::string query);
+bool insertDB(sqlite3 *tac_db, std::string query);
+bool deleteDB(sqlite3 *tac_db, std::string query);
+std::vector<std::string> selectDB(sqlite3 *tac_db, std::string query);
 
 #endif /* __DB_MANAGER_H__ */

diff --git a/NativeLauncher/inc/tac_common.h b/NativeLauncher/inc/tac_common.h
index 771e4ab..a97eb70 100644 (file)
--- a/NativeLauncher/inc/tac_common.h
+++ b/NativeLauncher/inc/tac_common.h
@@ -33,7 +33,7 @@ typedef enum {
  * @brief restore database of TAC
  * @return tac_error_e
  */
-tac_error_e restoreTACDB();
+tac_error_e tac_restoreDB();
 
 /**
  * @brief disable tac feature.
@@ -68,6 +68,6 @@ std::vector<std::string> getLibrariesInfo(const std::string& rootPath);
  * @brief restore database of TLC
  * @return tac_error_e
  */
-tac_error_e restoreTLCDB();
+tac_error_e tlc_restoreDB();
 
 #endif /* __TAC_COMMON_H__ */

diff --git a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
index 44d70a7..0a20793 100644 (file)
--- a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
+++ b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
@@ -101,7 +101,7 @@ static bool compareSHA256Info(std::string sha256Info, std::string nugetPackage)
        return false;
 }
 
-static int copyNCreateTacSymlink(std::string binPath, std::string tacVersionDir, std::string nugetPackage, bool isCreateTacDir)
+static int copyAssemblyCreateSymlink(std::string binPath, std::string tacVersionDir, std::string nugetPackage, bool isCreateTacDir)
 {
        std::string tac_dir = concatPath(binPath, TAC_SYMLINK_SUB_DIR);
        if (!createDir(tac_dir)) {
@@ -132,7 +132,7 @@ static int copyNCreateTacSymlink(std::string binPath, std::string tacVersionDir,
        return 0;
 }
 
-static void copyNCreateTlcSymlink(const char* pkgId, std::vector<std::string> LibrariesInfo, std::string tlcDir)
+static void copyLibraryCreateSymlink(const char* pkgId, std::vector<std::string> LibrariesInfo, std::string tlcDir)
 {
        if (LibrariesInfo.empty()) {
                _INFO("Not exist data for TLC in %s", pkgId);
@@ -162,7 +162,7 @@ static void copyNCreateTlcSymlink(const char* pkgId, std::vector<std::string> Li
                bf::create_symlink(concatPath(tlcDir, fileSha), library);
 
                char *sql = sqlite3_mprintf("INSERT INTO TLC (PKGID, LIBRARY) VALUES (%Q, %Q);", pkgId, fileSha.c_str());
-               if (!dbInsert(tlc_db, sql)) {
+               if (!insertDB(tlc_db, sql)) {
                        _ERR("Sqlite insert error");
                        sqlite3_free(sql);
                        copyFile(concatPath(tlcDir, fileSha), library);
@@ -175,7 +175,7 @@ static void copyNCreateTlcSymlink(const char* pkgId, std::vector<std::string> Li
        }
 }
 
-static void depsJsonCheck(std::string rootPath, std::string binPath, std::string execName)
+static void checkDepsJson(std::string rootPath, std::string binPath, std::string execName)
 {
        for (auto& npAssembly : depsJsonParser(rootPath, execName)) {
                std::string nuget_package = npAssembly.substr(0, npAssembly.rfind(':'));
@@ -217,18 +217,18 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                return 0;
        }
        if (metaValue == METADATA_VALUE) {
-               depsJsonCheck(rootPath, binPath, execName);
+               checkDepsJson(rootPath, binPath, execName);
        }
 
        status = "install";
-       tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
+       tac_db = createDB(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                _ERR("Sqlite create error. So restore the database.");
-               if (restoreTACDB() != TAC_ERROR_NONE) {
+               if (tac_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite create error");
                        return 0;
                }
-               tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
+               tac_db = createDB(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
                if (!tac_db) {
                        _ERR("Sqlite create error");
                        return 0;
@@ -263,7 +263,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                                return -1;
                        }
 
-                       if (copyNCreateTacSymlink(binPath, tac_version_dir, np, true) < 0) {
+                       if (copyAssemblyCreateSymlink(binPath, tac_version_dir, np, true) < 0) {
                                _ERR("Failed to create symlink");
                                return -1;
                        }
@@ -271,13 +271,13 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        char *sql = sqlite3_mprintf(
                                "INSERT INTO TAC (PKGID, NUGET, NAME, VERSION) " \
                                "VALUES (%Q, %Q, %Q, %Q);", pkgId, np.c_str(), tac_name.c_str(), tac_version.c_str());
-                       dbInsert(tac_db, sql);
+                       insertDB(tac_db, sql);
                        sqlite3_free(sql);
                } else {
                        _INFO("Exists tac_version_dir [%s]", tac_version_dir.c_str());
                        if (!bf::is_symlink(sha256_info)) {
                                if (compareSHA256Info(sha256_info, np)) {
-                                       if (copyNCreateTacSymlink(binPath, tac_version_dir, np, false) < 0) {
+                                       if (copyAssemblyCreateSymlink(binPath, tac_version_dir, np, false) < 0) {
                                                _ERR("Failed to create symlink");
                                                return -1;
                                        }
@@ -285,7 +285,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                                        char *sql = sqlite3_mprintf(
                                                "INSERT INTO TAC (PKGID, NUGET, NAME, VERSION) " \
                                                "VALUES (%Q, %Q, %Q, %Q);", pkgId, np.c_str(), tac_name.c_str(), tac_version.c_str());
-                                       dbInsert(tac_db, sql);
+                                       insertDB(tac_db, sql);
                                        sqlite3_free(sql);
                                } else {
                                        _INFO("Different nuget : %s", np.c_str());
@@ -309,14 +309,14 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                return 0;
        }
 
-       tlc_db = dbCreate(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
+       tlc_db = createDB(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
        if (!tlc_db) {
                _ERR("Sqlite create error. So restore the database.");
-               if (restoreTLCDB() != TAC_ERROR_NONE) {
+               if (tlc_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite create error");
                        return 0;
                }
-               tlc_db = dbCreate(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
+               tlc_db = createDB(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
                if (!tlc_db) {
                        _ERR("Sqlite create error");
                        return 0;
@@ -324,7 +324,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
        }
        sqlite3_exec(tlc_db, "BEGIN;", NULL, NULL, NULL);
 
-       copyNCreateTlcSymlink(pkgId, getLibrariesInfo(rootPath), tlcDir);
+       copyLibraryCreateSymlink(pkgId, getLibrariesInfo(rootPath), tlcDir);
 
        return 0;
 }
@@ -336,7 +336,7 @@ static int sqliteCb(void *count, int argc, char **argv, char **colName)
        return 0;
 }
 
-static int updateTacDB(sqlite3 *sqlite)
+static int tac_updateDB(sqlite3 *sqlite)
 {
        for (auto& unp : updateTac) {
                int count = -1;
@@ -366,7 +366,7 @@ static int updateTacDB(sqlite3 *sqlite)
        return 0;
 }
 
-static void updateTlcDB(sqlite3 *sqlite, std::vector<std::string> updateTlc, std::string tlcDir)
+static void tlc_updateDB(sqlite3 *sqlite, std::vector<std::string> updateTlc, std::string tlcDir)
 {
        for (auto& ulp : updateTlc) {
                int count = -1;
@@ -427,19 +427,19 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                        return 0;
                }
                if (metaValue == METADATA_VALUE) {
-                       depsJsonCheck(rootPath, binPath, execName);
+                       checkDepsJson(rootPath, binPath, execName);
                }
        }
 
        status = "update";
-       tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
+       tac_db = createDB(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                _ERR("Sqlite create error. So restore the database.");
-               if (restoreTACDB() != TAC_ERROR_NONE) {
+               if (tac_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite create error");
                        return 0;
                }
-               tac_db = dbCreate(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
+               tac_db = createDB(TAC_APP_LIST_DB, CREATE_TAC_DB_TABLE);
                if (!tac_db) {
                        _ERR("Sqlite create error");
                        return 0;
@@ -448,15 +448,15 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
        sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
 
        char *sql = sqlite3_mprintf("SELECT * FROM TAC WHERE PKGID = %Q;", pkgId);
-       updateTac = dbSelect(tac_db, sql);
+       updateTac = selectDB(tac_db, sql);
        sqlite3_free(sql);
 
        bool skipTLC = false;
        if (tacDB.empty()) {
                sql = sqlite3_mprintf("DELETE FROM TAC WHERE PKGID = %Q;", pkgId);
-               dbDelete(tac_db, sql);
+               deleteDB(tac_db, sql);
                sqlite3_free(sql);
-               if (updateTacDB(tac_db) < 0) {
+               if (tac_updateDB(tac_db) < 0) {
                        return -1;
                }
                skipTLC = true;
@@ -484,7 +484,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                        return -1;
                                }
 
-                               if (copyNCreateTacSymlink(binPath, tac_version_dir, np, true) < 0) {
+                               if (copyAssemblyCreateSymlink(binPath, tac_version_dir, np, true) < 0) {
                                        _ERR("Failed to create symlink");
                                        return -1;
                                }
@@ -503,20 +503,20 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                        sql = sqlite3_mprintf(
                                                "UPDATE TAC SET NAME = %Q, VERSION = %Q, NUGET = %Q WHERE PKGID = %Q AND NAME = %Q;",
                                                tac_name.c_str(), tac_version.c_str(), np.c_str(), pkgId, tac_name.c_str());
-                                       dbUpdate(tac_db, sql);
+                                       updateDB(tac_db, sql);
                                        sqlite3_free(sql);
                                } else if (count == 0) {
                                        sql = sqlite3_mprintf(
                                                "INSERT INTO TAC (PKGID, NUGET, NAME, VERSION) " \
                                                "VALUES (%Q, %Q, %Q, %Q);", pkgId, np.c_str(), tac_name.c_str(), tac_version.c_str());
-                                       dbInsert(tac_db, sql);
+                                       insertDB(tac_db, sql);
                                        sqlite3_free(sql);
                                }
                        } else {
                                _INFO("Exists tac_version_dir [%s]", tac_version_dir.c_str());
                                if (!bf::is_symlink(sha256_info)) {
                                        if (compareSHA256Info(sha256_info, np)) {
-                                               if (copyNCreateTacSymlink(binPath, tac_version_dir, np, false) < 0) {
+                                               if (copyAssemblyCreateSymlink(binPath, tac_version_dir, np, false) < 0) {
                                                        _ERR("Failed to create symlink");
                                                        return -1;
                                                }
@@ -535,13 +535,13 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                                        sql = sqlite3_mprintf(
                                                                "UPDATE TAC SET NAME = %Q, VERSION = %Q, NUGET = %Q WHERE PKGID = %Q AND NAME = %Q;",
                                                                tac_name.c_str(), tac_version.c_str(), np.c_str(), pkgId, tac_name.c_str());
-                                                       dbUpdate(tac_db, sql);
+                                                       updateDB(tac_db, sql);
                                                        sqlite3_free(sql);
                                                } else if (count == 0) {
                                                        sql = sqlite3_mprintf(
                                                                "INSERT INTO TAC (PKGID, NUGET, NAME, VERSION) " \
                                                                "VALUES (%Q, %Q, %Q, %Q);", pkgId, np.c_str(), tac_name.c_str(), tac_version.c_str());
-                                                       dbInsert(tac_db, sql);
+                                                       insertDB(tac_db, sql);
                                                        sqlite3_free(sql);
                                                }
                                        } else {
@@ -568,11 +568,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                        }
                        if (!isExits) {
                                char *sql = sqlite3_mprintf("DELETE FROM TAC WHERE PKGID = %Q AND NUGET = %Q;", pkgId, unp.c_str());
-                               dbDelete(tac_db, sql);
+                               deleteDB(tac_db, sql);
                                sqlite3_free(sql);
                        }
                }
-               if (updateTacDB(tac_db) < 0) {
+               if (tac_updateDB(tac_db) < 0) {
                        return -1;
                }
        }
@@ -584,14 +584,14 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                return 0;
        }
 
-       tlc_db = dbCreate(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
+       tlc_db = createDB(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
        if (!tlc_db) {
                _ERR("Sqlite create error. So restore the database.");
-               if (restoreTLCDB() != TAC_ERROR_NONE) {
+               if (tlc_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite create error");
                        return 0;
                }
-               tlc_db = dbCreate(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
+               tlc_db = createDB(TLC_APP_LIST_DB, CREATE_TLC_DB_TABLE);
                if (!tlc_db) {
                        _ERR("Sqlite create error");
                        return 0;
@@ -600,11 +600,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
        sqlite3_exec(tlc_db, "BEGIN;", NULL, NULL, NULL);
 
        sql = sqlite3_mprintf("SELECT * FROM TLC WHERE PKGID = %Q;", pkgId);
-       std::vector<std::string> updateTlc = dbSelect(tlc_db, sql);
+       std::vector<std::string> updateTlc = selectDB(tlc_db, sql);
        sqlite3_free(sql);
 
        sql = sqlite3_mprintf("DELETE FROM TLC WHERE PKGID = %Q;", pkgId);
-       dbDelete(tlc_db, sql);
+       deleteDB(tlc_db, sql);
        sqlite3_free(sql);
 
        std::vector<std::string> librariesInfo = getLibrariesInfo(rootPath);
@@ -612,9 +612,9 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                librariesInfo.clear();
        }
 
-       copyNCreateTlcSymlink(pkgId, librariesInfo, tlcDir);
+       copyLibraryCreateSymlink(pkgId, librariesInfo, tlcDir);
 
-       updateTlcDB(tlc_db, updateTlc, tlcDir);
+       tlc_updateDB(tlc_db, updateTlc, tlcDir);
 
        return 0;
 }
@@ -632,14 +632,14 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgId, const char *a
        tacPluginInstalled = true;
 
        status = "uninstall";
-       tac_db = dbOpen(TAC_APP_LIST_DB);
+       tac_db = openDB(TAC_APP_LIST_DB);
        if (!tac_db) {
                _ERR("Sqlite open error. So restore the database.");
-               if (restoreTACDB() != TAC_ERROR_NONE) {
+               if (tac_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite open error");
                        return 0;
                }
-               tac_db = dbOpen(TAC_APP_LIST_DB);
+               tac_db = openDB(TAC_APP_LIST_DB);
                if (!tac_db) {
                        _ERR("Sqlite open error");
                        return 0;
@@ -648,26 +648,26 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgId, const char *a
        sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
 
        char *sql = sqlite3_mprintf("SELECT * FROM TAC WHERE PKGID = %Q;", pkgId);
-       updateTac = dbSelect(tac_db, sql);
+       updateTac = selectDB(tac_db, sql);
        sqlite3_free(sql);
 
        sql = sqlite3_mprintf("DELETE FROM TAC WHERE PKGID = %Q;", pkgId);
-       dbDelete(tac_db, sql);
+       deleteDB(tac_db, sql);
        sqlite3_free(sql);
 
-       if (updateTacDB(tac_db) < 0) {
+       if (tac_updateDB(tac_db) < 0) {
                return -1;
        }
 
        ///// TLC /////
-       tlc_db = dbOpen(TLC_APP_LIST_DB);
+       tlc_db = openDB(TLC_APP_LIST_DB);
        if (!tlc_db) {
                _ERR("Sqlite open error. So restore the database.");
-               if (restoreTLCDB() != TAC_ERROR_NONE) {
+               if (tlc_restoreDB() != TAC_ERROR_NONE) {
                        _ERR("Sqlite open error");
                        return 0;
                }
-               tlc_db = dbOpen(TLC_APP_LIST_DB);
+               tlc_db = openDB(TLC_APP_LIST_DB);
                if (!tlc_db) {
                        _ERR("Sqlite open error");
                        return 0;
@@ -676,14 +676,14 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgId, const char *a
        sqlite3_exec(tlc_db, "BEGIN;", NULL, NULL, NULL);
 
        sql = sqlite3_mprintf("SELECT * FROM TLC WHERE PKGID = %Q;", pkgId);
-       std::vector<std::string> updateTlc = dbSelect(tlc_db, sql);
+       std::vector<std::string> updateTlc = selectDB(tlc_db, sql);
        sqlite3_free(sql);
 
        sql = sqlite3_mprintf("DELETE FROM TLC WHERE PKGID = %Q;", pkgId);
-       dbDelete(tlc_db, sql);
+       deleteDB(tlc_db, sql);
        sqlite3_free(sql);
 
-       updateTlcDB(tlc_db, updateTlc, concatPath(__DOTNET_DIR, TLC_LIBRARIES_DIR));
+       tlc_updateDB(tlc_db, updateTlc, concatPath(__DOTNET_DIR, TLC_LIBRARIES_DIR));
 
        return 0;
 }
@@ -785,12 +785,12 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_CLEAN(const char *pkgId, const char *appId
        }
 
        if (tac_db) {
-               dbClose(tac_db);
+               closeDB(tac_db);
                tac_db = NULL;
        }
 
        if (tlc_db) {
-               dbClose(tlc_db);
+               closeDB(tlc_db);
                tlc_db = NULL;
        }
 
@@ -881,14 +881,14 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UNDO(const char *pkgId, const char *appId,
        }
 
        if (tac_db) {
-               dbRollback(tac_db);
+               rollbackDB(tac_db);
                tac_db = NULL;
        }
 
        if (tlc_db) {
-               dbRollback(tlc_db);
+               rollbackDB(tlc_db);
                tlc_db = NULL;
        }
 
        return 0;
-}
\ No newline at end of file
+}

diff --git a/NativeLauncher/tool/dotnettool.cc b/NativeLauncher/tool/dotnettool.cc
index 7ff16df..bb8ba55 100644 (file)
--- a/NativeLauncher/tool/dotnettool.cc
+++ b/NativeLauncher/tool/dotnettool.cc
@@ -228,11 +228,11 @@ int main(int argc, char* argv[])
        }
        //sh-3.2# dotnettool --tac-restore-db
        else if (cmd == "--tac-restore-db") {
-               int ret = restoreTACDB();
+               int ret = tac_restoreDB();
                if (ret != TAC_ERROR_NONE) {
                        fprintf(stderr, "Failed to restore TAC db\n");
                }
-               ret = restoreTLCDB();
+               ret = tlc_restoreDB();
                if (ret != TAC_ERROR_NONE) {
                        fprintf(stderr, "Failed to restore TLC db\n");
                }

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index fe1ce7b..cabb813 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -730,7 +730,7 @@ static int regenTacCb(pkgmgrinfo_appinfo_h handle, void *userData)
                return -1;
        }
 
-       sqlite3 *tac_db = dbOpen(TAC_APP_LIST_DB);
+       sqlite3 *tac_db = openDB(TAC_APP_LIST_DB);
        if (!tac_db) {
                fprintf(stderr, "Sqlite open error\n");
                return -1;
@@ -738,11 +738,11 @@ static int regenTacCb(pkgmgrinfo_appinfo_h handle, void *userData)
        sqlite3_exec(tac_db, "BEGIN;", NULL, NULL, NULL);
 
        char *sql = sqlite3_mprintf("SELECT * FROM TAC WHERE PKGID = %Q;", pkgId);
-       std::vector<std::string> nugets = dbSelect(tac_db, sql);
+       std::vector<std::string> nugets = selectDB(tac_db, sql);
        sqlite3_free(sql);
 
        if (tac_db) {
-               dbClose(tac_db);
+               closeDB(tac_db);
                tac_db = NULL;
        }
 

diff --git a/NativeLauncher/tool/tac_common.cc b/NativeLauncher/tool/tac_common.cc
index 0dc053f..72c6c71 100644 (file)
--- a/NativeLauncher/tool/tac_common.cc
+++ b/NativeLauncher/tool/tac_common.cc
@@ -77,7 +77,7 @@ static void cleanupDirectory()
 }
 
 // callback function of "pkgmgrinfo_appinfo_metadata_filter_foreach"
-static int restoreTACDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
+static int tac_restoreDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
 {
        char *pkgId = NULL;
        char *root = NULL;
@@ -127,7 +127,7 @@ static int restoreTACDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
                        char *sql = sqlite3_mprintf(
                                "INSERT INTO TAC (PKGID, NUGET, NAME, VERSION) " \
                                "VALUES (%Q, %Q, %Q, %Q);",     pkgId, nuget.c_str(), name.c_str(), version.c_str());
-                       dbInsert(tac_db, sql);
+                       insertDB(tac_db, sql);
                        restore_nuget.push_back(concatPath(__DOTNET_DIR, nuget));
                        sqlite3_free(sql);
                }
@@ -136,7 +136,7 @@ static int restoreTACDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
        return 0;
 }
 
-tac_error_e restoreTACDB()
+tac_error_e tac_restoreDB()
 {
        if (!removeFile(TAC_APP_LIST_RESTORE_DB)) {
                fprintf(stderr, "Failed to remove of %s\n", TAC_APP_LIST_RESTORE_DB);
@@ -149,7 +149,7 @@ tac_error_e restoreTACDB()
                return TAC_ERROR_UNKNOWN;
        }
 
-       tac_db = dbCreate(TAC_APP_LIST_RESTORE_DB, CREATE_TAC_DB_TABLE);
+       tac_db = createDB(TAC_APP_LIST_RESTORE_DB, CREATE_TAC_DB_TABLE);
        if (!tac_db) {
                fprintf(stderr, "Sqlite create error\n");
                return TAC_ERROR_UNKNOWN;
@@ -168,7 +168,7 @@ tac_error_e restoreTACDB()
                return TAC_ERROR_UNKNOWN;
        }
 
-       ret = pkgmgrinfo_appinfo_metadata_filter_foreach(handle, restoreTACDBCb, NULL);
+       ret = pkgmgrinfo_appinfo_metadata_filter_foreach(handle, tac_restoreDBCb, NULL);
        if (ret != PMINFO_R_OK) {
                fprintf(stderr, "Failed pkgmgrinfo_appinfo_metadata_filter_foreach\n");
                pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
@@ -179,7 +179,7 @@ tac_error_e restoreTACDB()
        pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
 
        if (tac_db) {
-               dbClose(tac_db);
+               closeDB(tac_db);
                tac_db = NULL;
        }
 
@@ -473,7 +473,7 @@ std::vector<std::string> getLibrariesInfo(const std::string& rootPath)
 }
 
 // callback function of "pkgmgrinfo_appinfo_metadata_filter_foreach"
-static int restoreTLCDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
+static int tlc_restoreDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
 {
        char *pkgId = NULL;
        char *root = NULL;
@@ -497,7 +497,7 @@ static int restoreTLCDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
                if (bf::exists(library)) {
                        std::string fileSha = library.substr(library.rfind('/') + 1) + ".." + librarySha.substr(librarySha.find(':') + 1);
                        char *sql = sqlite3_mprintf("INSERT INTO TLC (PKGID, LIBRARY) VALUES (%Q, %Q);", pkgId, fileSha.c_str());
-                       dbInsert(tlc_db, sql);
+                       insertDB(tlc_db, sql);
                        restore_library.push_back(fileSha);
                        sqlite3_free(sql);
                }
@@ -505,7 +505,7 @@ static int restoreTLCDBCb(pkgmgrinfo_appinfo_h handle, void *userData)
        return 0;
 }
 
-tac_error_e restoreTLCDB()
+tac_error_e tlc_restoreDB()
 {
        if (!removeFile(TLC_APP_LIST_RESTORE_DB)) {
                fprintf(stderr, "Failed to remove of %s\n", TLC_APP_LIST_RESTORE_DB);
@@ -518,7 +518,7 @@ tac_error_e restoreTLCDB()
                return TAC_ERROR_UNKNOWN;
        }
 
-       tlc_db = dbCreate(TLC_APP_LIST_RESTORE_DB, CREATE_TLC_DB_TABLE);
+       tlc_db = createDB(TLC_APP_LIST_RESTORE_DB, CREATE_TLC_DB_TABLE);
        if (!tlc_db) {
                fprintf(stderr, "Sqlite create error\n");
                return TAC_ERROR_UNKNOWN;
@@ -537,7 +537,7 @@ tac_error_e restoreTLCDB()
                return TAC_ERROR_UNKNOWN;
        }
 
-       ret = pkgmgrinfo_appinfo_metadata_filter_foreach(handle, restoreTLCDBCb, NULL);
+       ret = pkgmgrinfo_appinfo_metadata_filter_foreach(handle, tlc_restoreDBCb, NULL);
        if (ret != PMINFO_R_OK) {
                fprintf(stderr, "Failed pkgmgrinfo_appinfo_metadata_filter_foreach\n");
                pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
@@ -548,7 +548,7 @@ tac_error_e restoreTLCDB()
        pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
 
        if (tlc_db) {
-               dbClose(tlc_db);
+               closeDB(tlc_db);
                tlc_db = NULL;
        }
 

diff --git a/NativeLauncher/util/db_manager.cc b/NativeLauncher/util/db_manager.cc
index 67adeed..6d340ff 100644 (file)
--- a/NativeLauncher/util/db_manager.cc
+++ b/NativeLauncher/util/db_manager.cc
@@ -24,7 +24,7 @@
 #endif
 #define LOG_TAG "DOTNET_INSTALLER_PLUGIN"
 
-static int dbIntegrityCheckCb(void *user_data, int argc, char **argv, char **not_used)
+static int checkIntegrityDBCb(void *user_data, int argc, char **argv, char **not_used)
 {
        bool* is_db_corrupted = static_cast<bool*>(user_data);
        std::string result_DB_check = argv[0];
@@ -38,7 +38,7 @@ static int dbIntegrityCheckCb(void *user_data, int argc, char **argv, char **not
        return 0;
 }
 
-sqlite3* dbCreate(std::string path, std::string query)
+sqlite3* createDB(std::string path, std::string query)
 {
        sqlite3 *sqlite = NULL;
        bool is_db_corrupted = false;
@@ -61,7 +61,7 @@ sqlite3* dbCreate(std::string path, std::string query)
                sqlite = NULL;
                return sqlite;
        }
-       ret = sqlite3_exec(sqlite, "PRAGMA integrity_check", dbIntegrityCheckCb, &is_db_corrupted, NULL);
+       ret = sqlite3_exec(sqlite, "PRAGMA integrity_check", checkIntegrityDBCb, &is_db_corrupted, NULL);
        if (ret == SQLITE_CORRUPT || is_db_corrupted) {
                _INFO("DB file is corrupted, start to recover corrupted db");
                sqlite3_close(sqlite);
@@ -71,7 +71,7 @@ sqlite3* dbCreate(std::string path, std::string query)
        return sqlite;
 }
 
-sqlite3* dbOpen(std::string path)
+sqlite3* openDB(std::string path)
 {
        sqlite3 *sqlite = NULL;
        bool is_db_corrupted = false;
@@ -80,7 +80,7 @@ sqlite3* dbOpen(std::string path)
                _INFO("DB file is corrupted, start to recover corrupted db");
                return sqlite;
        }
-       ret = sqlite3_exec(sqlite, "PRAGMA integrity_check", dbIntegrityCheckCb, &is_db_corrupted, NULL);
+       ret = sqlite3_exec(sqlite, "PRAGMA integrity_check", checkIntegrityDBCb, &is_db_corrupted, NULL);
        if (ret == SQLITE_CORRUPT || is_db_corrupted) {
                _INFO("DB file is corrupted, start to recover corrupted db");
                sqlite3_close(sqlite);
@@ -90,7 +90,7 @@ sqlite3* dbOpen(std::string path)
        return sqlite;
 }
 
-void dbFinalize(sqlite3_stmt *stmt)
+void finalizeDB(sqlite3_stmt *stmt)
 {
        if (stmt) {
                sqlite3_finalize(stmt);
@@ -98,7 +98,7 @@ void dbFinalize(sqlite3_stmt *stmt)
        }
 }
 
-void dbClose(sqlite3 *sqlite)
+void closeDB(sqlite3 *sqlite)
 {
        if (sqlite) {
                sqlite3_exec(sqlite, "COMMIT;", NULL, NULL, NULL);
@@ -107,7 +107,7 @@ void dbClose(sqlite3 *sqlite)
        }
 }
 
-void dbRollback(sqlite3 *sqlite)
+void rollbackDB(sqlite3 *sqlite)
 {
        if (sqlite) {
                sqlite3_exec(sqlite, "ROLLBACK;", NULL, NULL, NULL);
@@ -116,7 +116,7 @@ void dbRollback(sqlite3 *sqlite)
        }
 }
 
-static bool dbExec(sqlite3 *sqlite, std::string query)
+static bool execDB(sqlite3 *sqlite, std::string query)
 {
        int ret = sqlite3_exec(sqlite, query.c_str(), NULL, NULL, NULL);
        if (ret != SQLITE_OK) {
@@ -126,22 +126,22 @@ static bool dbExec(sqlite3 *sqlite, std::string query)
        return true;
 }
 
-bool dbUpdate(sqlite3 *sqlite, std::string query)
+bool updateDB(sqlite3 *sqlite, std::string query)
 {
-       return dbExec(sqlite, query);
+       return execDB(sqlite, query);
 }
 
-bool dbInsert(sqlite3 *sqlite, std::string query)
+bool insertDB(sqlite3 *sqlite, std::string query)
 {
-       return dbExec(sqlite, query);
+       return execDB(sqlite, query);
 }
 
-bool dbDelete(sqlite3 *sqlite, std::string query)
+bool deleteDB(sqlite3 *sqlite, std::string query)
 {
-       return dbExec(sqlite, query);
+       return execDB(sqlite, query);
 }
 
-std::vector<std::string> dbSelect(sqlite3 *sqlite, std::string query)
+std::vector<std::string> selectDB(sqlite3 *sqlite, std::string query)
 {
        std::vector<std::string> selectData;
        sqlite3_stmt* stmt = NULL;
@@ -155,6 +155,6 @@ std::vector<std::string> dbSelect(sqlite3 *sqlite, std::string query)
                str = (const char *) sqlite3_column_text(stmt, 2);
                selectData.push_back((!str || !strlen(str)) ? NULL : strdup(str));
        }
-       dbFinalize(stmt);
+       finalizeDB(stmt);
        return selectData;
 }