diff options
| author | Rikard Falkeborn <rikard.falkeborn@gmail.com> | 2016-09-22 20:00:00 +0200 |
|---|---|---|
| committer | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-05-09 05:27:43 +0200 |
| commit | 7cc50125498ad33f78871be282fb75e41f6e8a77 (patch) | |
| tree | 8224dddad991812c28d92e7442cf782d6f03b0a5 | |
| parent | 22cadea56aa4a991db5c97bc81b7ed60702269aa (diff) | |
| download | pacman-7cc50125498ad33f78871be282fb75e41f6e8a77.tar.gz pacman-7cc50125498ad33f78871be282fb75e41f6e8a77.tar.xz | |
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>
(cherry picked from commit 85171807c15fb5907d8337af2a50ab79392e1b8c)
| -rw-r--r-- | lib/libalpm/be_local.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/be_sync.c | 5 |
2 files changed, 4 insertions, 3 deletions
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 |