bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unneeded goto cleanup

Browse source 
Since commit 2ee7a8d8, there is no cleanup needed in this function. Just
return instead of jumping to the cleanup label.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2020-03-08 14:23:42 +10:00
parent e578903b60
commit 0deff63efa
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/libalpm/add.c
View file

@ -483,8 +483,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
/* set up fake remove transaction */ /* set up fake remove transaction */
if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) { if(_alpm_remove_single_package(handle, oldpkg, newpkg, 0, 0) == -1) {
handle->pm_errno = ALPM_ERR_TRANS_ABORT; handle->pm_errno = ALPM_ERR_TRANS_ABORT;
ret = -1; return -1;
goto cleanup;
} }
} }
@ -495,15 +494,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
"error: could not create database entry %s-%s\n", "error: could not create database entry %s-%s\n",
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
handle->pm_errno = ALPM_ERR_DB_WRITE; handle->pm_errno = ALPM_ERR_DB_WRITE;
ret = -1; return -1;
goto cleanup;
} }
fd = _alpm_open_archive(db->handle, pkgfile, &buf, fd = _alpm_open_archive(db->handle, pkgfile, &buf,
&archive, ALPM_ERR_PKG_OPEN); &archive, ALPM_ERR_PKG_OPEN);
if(fd < 0) { if(fd < 0) {
ret = -1; return -1;
goto cleanup;
} }
/* save the cwd so we can restore it later */ /* save the cwd so we can restore it later */
@ -521,8 +518,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
close(cwdfd); close(cwdfd);
} }
close(fd); close(fd);
ret = -1; return -1;
goto cleanup;
} }
if(trans->flags & ALPM_TRANS_FLAG_DBONLY) { if(trans->flags & ALPM_TRANS_FLAG_DBONLY) {
@ -606,8 +602,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
"error: could not update database entry %s-%s\n", "error: could not update database entry %s-%s\n",
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
handle->pm_errno = ALPM_ERR_DB_WRITE; handle->pm_errno = ALPM_ERR_DB_WRITE;
ret = -1; return -1;
goto cleanup;
} }
if(_alpm_db_add_pkgincache(db, newpkg) == -1) { if(_alpm_db_add_pkgincache(db, newpkg) == -1) {
@ -653,7 +648,6 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
event.type = ALPM_EVENT_PACKAGE_OPERATION_DONE; event.type = ALPM_EVENT_PACKAGE_OPERATION_DONE;
EVENT(handle, &event); EVENT(handle, &event);
cleanup:
return ret; return ret;
} }