diff options
| author | Allan McRae <allan@archlinux.org> | 2020-04-13 14:24:23 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2020-04-13 15:44:46 +0200 |
| commit | 6ba250e4001740ca428226abf157b25aa121c7bf (patch) | |
| tree | ffed2284aad82174e784e01f1ded9af126880cf9 /lib/libalpm/be_sync.c | |
| parent | 0eda92c5d4f8810a68066ee72713ffdfa878dd8c (diff) | |
| download | pacman-6ba250e4001740ca428226abf157b25aa121c7bf.tar.gz pacman-6ba250e4001740ca428226abf157b25aa121c7bf.tar.xz | |
Use GOTO_ERR throughout
The GOTO_ERR define was added in commit 80ae8014 for use in future commits.
There are plenty of places in the code base it can be used, so convert them.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/be_sync.c')
| -rw-r--r-- | lib/libalpm/be_sync.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5f457122..2cee97e0 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -464,9 +464,8 @@ 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; ret = -1; - goto cleanup; + GOTO_ERR(db->handle, ALPM_ERR_MEMORY, cleanup); } while((archive_ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { @@ -485,9 +484,8 @@ static int sync_db_populate(alpm_db_t *db) _alpm_log(db->handle, ALPM_LOG_ERROR, _("could not read db '%s' (%s)\n"), db->treename, archive_error_string(archive)); _alpm_db_free_pkgcache(db); - db->handle->pm_errno = ALPM_ERR_LIBARCHIVE; ret = -1; - goto cleanup; + GOTO_ERR(db->handle, ALPM_ERR_LIBARCHIVE, cleanup); } count = alpm_list_count(db->pkgcache->list); |