From 0f512ae46e0524b0b7abec0e11845ff86f17db92 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 29 Nov 2023 11:28:13 +1000 Subject: [PATCH] Do not increment on every database error to avoid overflow Signed-off-by: Allan McRae --- src/pacman/database.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pacman/database.c b/src/pacman/database.c index 572f0f82..3a2ec6a1 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -103,7 +103,7 @@ static int check_db_missing_deps(alpm_list_t *pkglist) pm_printf(ALPM_LOG_ERROR, "missing '%s' dependency for '%s'\n", depstring, miss->target); free(depstring); - ret++; + ret = 1; } alpm_list_free_inner(data, (alpm_list_fn_free)alpm_depmissing_free); alpm_list_free(data); @@ -135,12 +135,12 @@ static int check_db_local_files(void) snprintf(path, PATH_MAX, "%slocal/%s/desc", dbpath, ent->d_name); if(access(path, F_OK)) { pm_printf(ALPM_LOG_ERROR, "'%s': description file is missing\n", ent->d_name); - ret++; + ret = 1; } snprintf(path, PATH_MAX, "%slocal/%s/files", dbpath, ent->d_name); if(access(path, F_OK)) { pm_printf(ALPM_LOG_ERROR, "'%s': file list is missing\n", ent->d_name); - ret++; + ret = 1; } } closedir(dbdir); @@ -158,7 +158,7 @@ static int check_db_local_package_conflicts(alpm_list_t *pkglist) alpm_conflict_t *conflict = i->data; pm_printf(ALPM_LOG_ERROR, "'%s' conflicts with '%s'\n", alpm_pkg_get_name(conflict->package1), alpm_pkg_get_name(conflict->package2)); - ret++; + ret = 1; } alpm_list_free_inner(data, (alpm_list_fn_free)alpm_conflict_free); alpm_list_free(data); @@ -228,7 +228,7 @@ static int check_db_local_filelist_conflicts(alpm_list_t *pkglist) alpm_pkg_get_name(prev_fileitem->pkg), alpm_pkg_get_name(fileitem->pkg), fileitem->file->name); - ret++; + ret = 1; } prev_fileitem = fileitem; }