diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:39 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:39 +0200 |
| commit | afc96f2ab3d05f14a73e81f871164f01423b5572 (patch) | |
| tree | 16ff0c0f2390b51ed43cfaa1a9ec508678793ec6 /lib/libalpm/conflict.c | |
| parent | bd88a8d5511c24db55dd2a5c04161918571dbfbd (diff) | |
| download | pacman-afc96f2ab3d05f14a73e81f871164f01423b5572.tar.gz pacman-afc96f2ab3d05f14a73e81f871164f01423b5572.tar.xz | |
Prefix _alpm_errno_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index af1bce15..ad689dcf 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -303,7 +303,7 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, return conflicts; error: - RET_ERR(handle, PM_ERR_MEMORY, conflicts); + RET_ERR(handle, ALPM_ERR_MEMORY, conflicts); } void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) @@ -409,7 +409,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, conflicts = add_fileconflict(handle, conflicts, ALPM_FILECONFLICT_TARGET, path, alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); - if(handle->pm_errno == PM_ERR_MEMORY) { + if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); FREELIST(common_files); return NULL; @@ -535,7 +535,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(!resolved_conflict) { conflicts = add_fileconflict(handle, conflicts, ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); - if(handle->pm_errno == PM_ERR_MEMORY) { + if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { /* only freed if it was generated from filelist_operation() */ |