From a075e9538b97645dd3bd104bab6bf13530d8335a Mon Sep 17 00:00:00 2001 From: Ilho Kim Date: Mon, 29 Jan 2024 20:29:14 +0900 Subject: [PATCH] Fix static analysis issue Use of auto that causes a copy Change-Id: If260acdf627a1b2ebeebd6bd5102772cb140c7ba Signed-off-by: Ilho Kim --- src/server/appinfo_internal.cc | 20 +++++++-------- src/server/certinfo_internal.cc | 8 +++--- src/server/pkginfo_internal.cc | 56 ++++++++++++++++++++--------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/server/appinfo_internal.cc b/src/server/appinfo_internal.cc index 1e05dce..d6f2359 100644 --- a/src/server/appinfo_internal.cc +++ b/src/server/appinfo_internal.cc @@ -85,11 +85,11 @@ void ParseAppControl(GList** appcontrol, int GetSplashScreens(const tizen_base::Database& db, const char* appid, GList** splashscreens) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT src, type, orientation, indicatordisplay, " "operation, color_depth " "FROM package_app_splash_screen WHERE app_id=?") - .Bind(appid); + .Bind(appid)); auto r = db.Exec(q); if (!r) { @@ -120,10 +120,10 @@ int GetSplashScreens(const tizen_base::Database& db, int GetMetadata(const tizen_base::Database& db, const char* appid, GList** metadata) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT md_key, md_value " "FROM package_app_app_metadata WHERE app_id=?") - .Bind(appid); + .Bind(appid)); auto r = db.Exec(q); if (!r) { @@ -150,10 +150,10 @@ int GetMetadata(const tizen_base::Database& db, int GetAppControl(const tizen_base::Database& db, const char* appid, GList** appcontrol) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT app_control, visibility, app_control_id " "FROM package_app_app_control WHERE app_id=?") - .Bind(appid); + .Bind(appid)); auto r = db.Exec(q); if (!r) { @@ -171,10 +171,10 @@ int GetAppControl(const tizen_base::Database& db, int GetCategory(const tizen_base::Database& db, const char* appid, GList** category) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT category " "FROM package_app_app_category WHERE app_id=?") - .Bind(appid); + .Bind(appid)); auto r = db.Exec(q); if (!r) { _LOGE("db.Exec() failed: %s", static_cast(r)); @@ -192,10 +192,10 @@ int GetCategory(const tizen_base::Database& db, int GetResControl(const tizen_base::Database& db, const char* appid, GList** res_control) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT res_type, min_res_version, max_res_version, auto_close " "FROM package_app_res_control WHERE app_id=?") - .Bind(appid); + .Bind(appid)); auto r = db.Exec(q); if (!r) { diff --git a/src/server/certinfo_internal.cc b/src/server/certinfo_internal.cc index 0de80e1..c9e9a37 100644 --- a/src/server/certinfo_internal.cc +++ b/src/server/certinfo_internal.cc @@ -66,13 +66,13 @@ int GetCertInfo(const tizen_base::Database& db, int cert_id[], int GetCertId(const tizen_base::Database& db, std::string_view pkgid, int (&cert_id)[MAX_CERT_TYPE]) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT author_root_cert, author_im_cert, " "author_signer_cert, dist_root_cert, " "dist_im_cert, dist_signer_cert, dist2_root_cert, " "dist2_im_cert, dist2_signer_cert " "FROM package_cert_info WHERE package=?") - .Bind(std::string(pkgid)); + .Bind(std::string(pkgid))); auto r = db.Exec(q); if (!r) { @@ -146,7 +146,7 @@ int SaveCertIndex(const tizen_base::Database& db, int SaveCertInfo(const tizen_base::Database& db, std::string_view pkgid, char* cert_info[]) { - auto q_insert = tizen_base::Database::Sql( + auto q_insert = std::move(tizen_base::Database::Sql( "INSERT OR REPLACE INTO package_cert_info (package," " author_root_cert, author_im_cert, author_signer_cert," " dist_root_cert, dist_im_cert, dist_signer_cert," @@ -170,7 +170,7 @@ int SaveCertInfo(const tizen_base::Database& db, " WHERE cert_info=?)," " (SELECT cert_id FROM package_cert_index_info" " WHERE cert_info=?))") - .Bind(std::string(pkgid)); + .Bind(std::string(pkgid))); for (int i = 0; i < MAX_CERT_TYPE; i++) q_insert.Bind(cert_info[i]); diff --git a/src/server/pkginfo_internal.cc b/src/server/pkginfo_internal.cc index 00816e2..b2000ca 100644 --- a/src/server/pkginfo_internal.cc +++ b/src/server/pkginfo_internal.cc @@ -99,10 +99,10 @@ int _pkginfo_add_description_info_into_list(const char *locale, int GetPluginExecutionInfo(const tizen_base::Database& db, const char* pkgid, GList** plugins) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT appid, plugin_type, plugin_name FROM package_plugin_info " "WHERE pkgid=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { @@ -130,10 +130,10 @@ int GetPluginExecutionInfo(const tizen_base::Database& db, int GetPrivilege(const tizen_base::Database& db, const char* pkgid, GList** privileges) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT DISTINCT privilege, type FROM package_privilege_info " "WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { LOGE("db.Exec failed : %s", static_cast(r)); @@ -158,10 +158,10 @@ int GetPrivilege(const tizen_base::Database& db, const char* pkgid, int GetAppdefinedPrivilege(const tizen_base::Database& db, const char* pkgid, GList** privileges) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT DISTINCT privilege, license, type FROM " "package_appdefined_privilege_info WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { LOGE("db.Exec failed : %s", static_cast(r)); @@ -187,10 +187,10 @@ int GetAppdefinedPrivilege(const tizen_base::Database& db, int GetDependency(const tizen_base::Database& db, const char* pkgid, GList** dependencies) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT DISTINCT depends_on, type, required_version " "FROM package_dependency_info WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { LOGE("db.Exec failed : %s", static_cast(r)); @@ -216,10 +216,10 @@ int GetDependency(const tizen_base::Database& db, const char* pkgid, int GetResAllowedPackages(const tizen_base::Database& db, const char* pkgid, GList** allowed_packages) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT DISTINCT allowed_package, required_privilege " "FROM package_res_allowed_package WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { LOGE("db.Exec failed : %s", static_cast(r)); @@ -272,10 +272,10 @@ int GetResAllowedPackages(const tizen_base::Database& db, const char* pkgid, int GetResInfo(const tizen_base::Database& db, const char* pkgid, char** res_type, char** res_version, char** lib, GList** res_allowed_packages) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT DISTINCT res_type, res_version, lib " "FROM package_res_info WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { LOGE("db.Exec() failed : %s", static_cast(r)); @@ -298,10 +298,10 @@ int GetResInfo(const tizen_base::Database& db, const char* pkgid, int GetPackageMetadata(const tizen_base::Database& db, const char* pkgid, GList** metadata) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT md_key, md_value " "FROM package_metadata WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { @@ -677,10 +677,10 @@ int DoGetDependsOn(const tizen_base::Database& db, const std::string& pkgid, return PMINFO_R_OK; dup_checker.insert(pkgid); - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "SELECT package, depends_on, type, required_version " "FROM package_dependency_info WHERE depends_on=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { @@ -1015,7 +1015,7 @@ int InsertPackageDependencyInfo(const tizen_base::Database& db, int InsertMainappLocalizedInfo(const tizen_base::Database& db, application_x* app, const char* locale, const char* label, const char* icon) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "INSERT OR REPLACE INTO package_localized_info (" " package, package_locale, package_label, package_icon," " package_description, package_license, package_author) " @@ -1043,7 +1043,7 @@ int InsertMainappLocalizedInfo(const tizen_base::Database& db, .Bind(app->package) .Bind(locale) .Bind(app->package) - .Bind(locale); + .Bind(locale)); auto r = db.Exec(q); if (!r) { _LOGE("db.Exec() failed: %s", static_cast(r)); @@ -1799,13 +1799,13 @@ int InsertPackageResInfo(const tizen_base::Database& db, manifest_x* mfx) { if (mfx->lib == nullptr) mfx->lib = strdup("false"); - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "INSERT INTO package_res_info (package, res_type," " res_version, lib) VALUES (?, ?, ?, ?)") .Bind(mfx->package) .Bind(mfx->res_type) .Bind(mfx->res_version) - .Bind(mfx->lib); + .Bind(mfx->lib)); auto r = db.Exec(q); if (!r) { @@ -1977,11 +1977,11 @@ int InsertApplicationInfo(const tizen_base::Database& db, manifest_x *mfx) { } int InsertPackageUpdateInfo(const tizen_base::Database& db, manifest_x *mfx) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "INSERT INTO package_update_info (package, update_version) " "VALUES (?, ?)") .Bind(mfx->package) - .Bind(mfx->version); + .Bind(mfx->version)); auto r = db.Exec(q); if (!r) { @@ -2052,7 +2052,7 @@ int DoInsertPackageInfo(const tizen_base::Database& db, manifest_x* mfx) { author_href = ((author_x *)mfx->author->data)->href; } - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "INSERT INTO package_info (package, package_type," " package_version, package_api_version, package_tep_name," " package_zip_mount_file, install_location, package_size," @@ -2100,7 +2100,7 @@ int DoInsertPackageInfo(const tizen_base::Database& db, manifest_x* mfx) { .Bind(mfx->csc_path) .Bind(mfx->support_mode ? mfx->support_mode : "0") .Bind(__get_bool(mfx->support_disable, false)) - .Bind(mfx->light_user_switch_mode); + .Bind(mfx->light_user_switch_mode)); auto r = db.Exec(q); if (!r) { @@ -2129,9 +2129,9 @@ int DoInsertPackageInfo(const tizen_base::Database& db, manifest_x* mfx) { } int DoDeletePackageInfo(const tizen_base::Database& db, const char* pkgid) { - auto q = tizen_base::Database::Sql( + auto q = std::move(tizen_base::Database::Sql( "DELETE FROM package_info WHERE package=?") - .Bind(pkgid); + .Bind(pkgid)); auto r = db.Exec(q); if (!r) { _LOGE("db.Exec() failed: %s", static_cast(r)); @@ -2276,9 +2276,9 @@ int GetDependsOn(const tizen_base::Database& db, const std::string& pkgid, queue.push(pkgid); while (!queue.empty()) { - auto item = queue.front(); - queue.pop(); + const auto& item = queue.front(); int ret = DoGetDependsOn(db, item, queue, dup_checker, dep_list); + queue.pop(); if (ret != PMINFO_R_OK) { LOGE("failed to get pkgs depends on %s", pkgid.c_str()); for (auto i : dep_list) -- 2.7.4