diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2015-01-22 06:29:53 +0100 |
|---|---|---|
| committer | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-05-11 06:45:30 +0200 |
| commit | 2e63d6aa7fcdfd89f02758f02f5799a291405b40 (patch) | |
| tree | 03a2661f903afdbc6539b6530bf90aece2b4e55a /lib/libalpm/conflict.c | |
| parent | 4143760a944470d50975ee27da9e3380223e88b9 (diff) | |
| download | pacman-2e63d6aa7fcdfd89f02758f02f5799a291405b40.tar.gz pacman-2e63d6aa7fcdfd89f02758f02f5799a291405b40.tar.xz | |
make pm_errno thread-local
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d52f8942..43210db3 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -479,7 +479,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } conflicts = add_fileconflict(handle, conflicts, path, p1, p2); - if(handle->pm_errno == ALPM_ERR_MEMORY) { + if(alpm_errno(handle) == ALPM_ERR_MEMORY) { alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); @@ -684,7 +684,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(!resolved_conflict) { conflicts = add_fileconflict(handle, conflicts, path, p1, _alpm_find_file_owner(handle, relative_path)); - if(handle->pm_errno == ALPM_ERR_MEMORY) { + if(alpm_errno(handle) == ALPM_ERR_MEMORY) { alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); |