diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:38 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:38 +0200 |
| commit | d796d1cdda15889fc0793eae50582d75f07d55d5 (patch) | |
| tree | ae48011b53d7900a2caae5123d49f644ea6dcc53 /lib/libalpm/conflict.c | |
| parent | f818f570c555668314fa9ca657fba2fe3ffd8bd4 (diff) | |
| download | pacman-d796d1cdda15889fc0793eae50582d75f07d55d5.tar.gz pacman-d796d1cdda15889fc0793eae50582d75f07d55d5.tar.xz | |
Prefix alpm_fileconflicttype_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 5d9bbf23..615cd0c1 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -276,7 +276,7 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB, } /* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, type - * (either PM_FILECONFLICT_TARGET or PM_FILECONFLICT_FILESYSTEM), a file + * (either ALPM_FILECONFLICT_TARGET or ALPM_FILECONFLICT_FILESYSTEM), a file * string, and either two package names or one package name and NULL. This is * a wrapper for former functionality that was done inline. */ @@ -407,7 +407,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(k = common_files; k; k = k->next) { snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); conflicts = add_fileconflict(handle, conflicts, - PM_FILECONFLICT_TARGET, path, + ALPM_FILECONFLICT_TARGET, path, alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); if(handle->pm_errno == PM_ERR_MEMORY) { FREELIST(conflicts); @@ -534,7 +534,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(!resolved_conflict) { conflicts = add_fileconflict(handle, conflicts, - PM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); + ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); if(handle->pm_errno == PM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { |