From 85171807c15fb5907d8337af2a50ab79392e1b8c Mon Sep 17 00:00:00 2001
From: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Date: Thu, 22 Sep 2016 20:00:00 +0200
Subject: Return boolean from db_populate
Since the number of packages is not used anywhere, just return a
boolean to avoid the implicit cast from size_t to int in be_local.c.
Use 0 as success to be consistent with db_validate.
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
lib/libalpm/be_local.c | 2 +-
lib/libalpm/be_sync.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'lib')
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 3ef1975e..43c6bc93 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -612,7 +612,7 @@ static int local_db_populate(alpm_db_t *db)
_alpm_log(db->handle, ALPM_LOG_DEBUG, "added %zu packages to package cache for db '%s'\n",
count, db->treename);
- return count;
+ return 0;
}
/* Note: the return value must be freed by the caller */
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 06f96199..3591e3f8 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -464,6 +464,7 @@ static int sync_db_populate(alpm_db_t *db)
const char *dbpath;
size_t est_count;
int count, fd;
+ int ret = 0;
struct stat buf;
struct archive *archive;
struct archive_entry *entry;
@@ -497,7 +498,7 @@ static int sync_db_populate(alpm_db_t *db)
db->pkgcache = _alpm_pkghash_create(est_count);
if(db->pkgcache == NULL) {
db->handle->pm_errno = ALPM_ERR_MEMORY;
- count = -1;
+ ret = -1;
goto cleanup;
}
@@ -530,7 +531,7 @@ cleanup:
if(fd >= 0) {
close(fd);
}
- return count;
+ return ret;
}
/* This function validates %FILENAME%. filename must be between 3 and
--
cgit v1.2.3-70-g09d2