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>

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 50b21b54..8a9dcae8 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -456,11 +456,10 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
 				}
 			} else {
 				/* pm_errno was set by resolvedeps, callback may have overwrote it */
-				handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS;
 				alpm_list_free(resolved);
 				alpm_list_free(unresolvable);
 				ret = -1;
-				goto cleanup;
+				GOTO_ERR(handle, ALPM_ERR_UNSATISFIED_DEPS, cleanup);
 			}
 		}
 
@@ -820,7 +819,7 @@ static int download_files(alpm_handle_t *handle)
 			const alpm_pkg_t *pkg = i->data;
 			struct dload_payload payload = {0};
 
-			STRDUP(payload.remote_name, pkg->filename, handle->pm_errno = ALPM_ERR_MEMORY; goto finish);
+			STRDUP(payload.remote_name, pkg->filename, GOTO_ERR(handle, ALPM_ERR_MEMORY, finish));
 			payload.servers = pkg->origin_data.db->servers;
 			payload.max_size = pkg->size;