From 296c61f689ac2b6e595b35ad6edda02f9646c15f Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 10 Sep 2024 14:34:07 +0200 Subject: [PATCH] alpm: fix mixed declarations and code --- backends/alpm/pk-alpm-sync.c | 3 ++- backends/alpm/pk-alpm-update.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backends/alpm/pk-alpm-sync.c b/backends/alpm/pk-alpm-sync.c index 191287325..64ab1c295 100644 --- a/backends/alpm/pk-alpm-sync.c +++ b/backends/alpm/pk-alpm-sync.c @@ -44,6 +44,7 @@ pk_alpm_transaction_sync_targets (PkBackendJob *job, const gchar **packages, gbo g_auto(GStrv) package = pk_package_id_split (*packages); gchar *repo = package[PK_PACKAGE_ID_DATA]; gchar *name = package[PK_PACKAGE_ID_NAME]; + alpm_pkg_t *dep_to_remove; const alpm_list_t *i = alpm_get_syncdbs (priv->alpm); alpm_pkg_t *pkg; @@ -61,7 +62,7 @@ pk_alpm_transaction_sync_targets (PkBackendJob *job, const gchar **packages, gbo } pkg = alpm_db_get_pkg (i->data, name); - alpm_pkg_t *dep_to_remove = pk_alpm_pkg_replaces(priv->localdb, pkg); + dep_to_remove = pk_alpm_pkg_replaces(priv->localdb, pkg); if (dep_to_remove) { g_debug("scheduling to remove %s for %s", alpm_pkg_get_name(dep_to_remove), name); alpm_remove_pkg(priv->alpm, dep_to_remove); diff --git a/backends/alpm/pk-alpm-update.c b/backends/alpm/pk-alpm-update.c index bf64a08cf..1197bbb92 100644 --- a/backends/alpm/pk-alpm-update.c +++ b/backends/alpm/pk-alpm-update.c @@ -307,6 +307,7 @@ pk_alpm_update_databases (PkBackendJob *job, gint force, GError **error) PkBackend *backend = pk_backend_job_get_backend (job); PkBackendAlpmPrivate *priv = pk_backend_get_user_data (backend); alpm_list_t *i; + int ret; if (!pk_alpm_transaction_initialize (job, 0, NULL, error)) return FALSE; @@ -315,7 +316,7 @@ pk_alpm_update_databases (PkBackendJob *job, gint force, GError **error) pk_backend_job_set_status (job, PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST); i = alpm_get_syncdbs (priv->alpm); - int ret = pk_alpm_refresh_databases(job, force, i, error); + ret = pk_alpm_refresh_databases(job, force, i, error); if (i == NULL) return pk_alpm_transaction_end (job, error); @@ -377,9 +378,10 @@ static int dep_vercmp(const char *version1, alpm_depmod_t mod, alpm_pkg_t * pk_alpm_pkg_replaces (alpm_db_t *db, alpm_pkg_t *pkg) { + gboolean ret = FALSE; + g_return_val_if_fail (db != NULL, FALSE); g_return_val_if_fail (pkg != NULL, FALSE); - gboolean ret = FALSE; for (alpm_list_t *list = alpm_pkg_get_replaces (pkg); list != NULL && !ret; list = list->next) { alpm_depend_t *depend = list->data;