diff options
Diffstat (limited to 'backend/job.cc')
| -rw-r--r-- | backend/job.cc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/backend/job.cc b/backend/job.cc index 86468ea..4dcb232 100644 --- a/backend/job.cc +++ b/backend/job.cc @@ -1,3 +1,8 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ #include "job.h" #include <string> @@ -51,42 +56,42 @@ generate_query(PkBitfield filters) } void -pk_backend_search_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +pk_backend_search_thread (PkBackendJob *job, GVariant *params, void *user_data) { auto job_data = reinterpret_cast<slack::JobData *> (pk_backend_job_get_user_data (job)); pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); pk_backend_job_set_percentage (job, 0); - gchar **vals; + char **vals; PkBitfield filters; g_variant_get (params, "(t^a&s)", &filters, &vals); - gchar *search = g_strjoinv ("%", vals); + char *search = g_strjoinv ("%", vals); - gchar *query = sqlite3_mprintf (slack::generate_query(filters).c_str(), + char *query = sqlite3_mprintf (slack::generate_query(filters).c_str(), user_data, search); sqlite3_stmt *stmt; - if ((sqlite3_prepare_v2 (job_data->db, query, -1, &stmt, NULL) == SQLITE_OK)) + if ((sqlite3_prepare_v2 (job_data->db, query, -1, &stmt, nullptr) == SQLITE_OK)) { /* Now we're ready to output all packages */ while (sqlite3_step (stmt) == SQLITE_ROW) { PkInfoEnum info = slack::is_installed ( - reinterpret_cast<const gchar *> (sqlite3_column_text (stmt, 2))); + reinterpret_cast<const char *> (sqlite3_column_text (stmt, 2))); if ((info == PK_INFO_ENUM_INSTALLED || info == PK_INFO_ENUM_UPDATING) && slack::filter_package (filters, true)) { pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, - reinterpret_cast<const gchar *> (sqlite3_column_text (stmt, 0)), - reinterpret_cast<const gchar *> (sqlite3_column_text (stmt, 1))); + reinterpret_cast<const char *> (sqlite3_column_text (stmt, 0)), + reinterpret_cast<const char *> (sqlite3_column_text (stmt, 1))); } else if (info == PK_INFO_ENUM_INSTALLING && slack::filter_package (filters, false)) { pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, - reinterpret_cast<const gchar *> (sqlite3_column_text (stmt, 0)), - reinterpret_cast<const gchar *> (sqlite3_column_text (stmt, 1))); + reinterpret_cast<const char *> (sqlite3_column_text (stmt, 0)), + reinterpret_cast<const char *> (sqlite3_column_text (stmt, 1))); } } sqlite3_finalize (stmt); |