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 | |
| 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>
| -rw-r--r-- | lib/libalpm/alpm.h | 4 | ||||
| -rw-r--r-- | lib/libalpm/conflict.c | 6 | ||||
| -rw-r--r-- | src/pacman/sync.c | 4 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b8726af9..d0e2d3dd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -82,8 +82,8 @@ typedef enum _alpm_depmod_t { * another target in the transaction. */ typedef enum _alpm_fileconflicttype_t { - PM_FILECONFLICT_TARGET = 1, - PM_FILECONFLICT_FILESYSTEM + ALPM_FILECONFLICT_TARGET = 1, + ALPM_FILECONFLICT_FILESYSTEM } alpm_fileconflicttype_t; /** 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) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ce57d3cd..03150489 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -838,11 +838,11 @@ static int sync_trans(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { - case PM_FILECONFLICT_TARGET: + case ALPM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), conflict->file, conflict->target, conflict->ctarget); break; - case PM_FILECONFLICT_FILESYSTEM: + case ALPM_FILECONFLICT_FILESYSTEM: printf(_("%s: %s exists in filesystem\n"), conflict->target, conflict->file); break; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 31536a43..258db609 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -170,11 +170,11 @@ int pacman_upgrade(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { - case PM_FILECONFLICT_TARGET: + case ALPM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), conflict->file, conflict->target, conflict->ctarget); break; - case PM_FILECONFLICT_FILESYSTEM: + case ALPM_FILECONFLICT_FILESYSTEM: printf(_("%s: %s exists in filesystem\n"), conflict->target, conflict->file); break; |