mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
Prefix alpm_fileconflicttype_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
f818f570c5
commit
d796d1cdda
@ -82,8 +82,8 @@ typedef enum _alpm_depmod_t {
|
|||||||
* another target in the transaction.
|
* another target in the transaction.
|
||||||
*/
|
*/
|
||||||
typedef enum _alpm_fileconflicttype_t {
|
typedef enum _alpm_fileconflicttype_t {
|
||||||
PM_FILECONFLICT_TARGET = 1,
|
ALPM_FILECONFLICT_TARGET = 1,
|
||||||
PM_FILECONFLICT_FILESYSTEM
|
ALPM_FILECONFLICT_FILESYSTEM
|
||||||
} alpm_fileconflicttype_t;
|
} alpm_fileconflicttype_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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
|
/* 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
|
* string, and either two package names or one package name and NULL. This is
|
||||||
* a wrapper for former functionality that was done inline.
|
* 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) {
|
for(k = common_files; k; k = k->next) {
|
||||||
snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data);
|
snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data);
|
||||||
conflicts = add_fileconflict(handle, conflicts,
|
conflicts = add_fileconflict(handle, conflicts,
|
||||||
PM_FILECONFLICT_TARGET, path,
|
ALPM_FILECONFLICT_TARGET, path,
|
||||||
alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
|
alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
|
||||||
if(handle->pm_errno == PM_ERR_MEMORY) {
|
if(handle->pm_errno == PM_ERR_MEMORY) {
|
||||||
FREELIST(conflicts);
|
FREELIST(conflicts);
|
||||||
@ -534,7 +534,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
|
|||||||
|
|
||||||
if(!resolved_conflict) {
|
if(!resolved_conflict) {
|
||||||
conflicts = add_fileconflict(handle, conflicts,
|
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) {
|
if(handle->pm_errno == PM_ERR_MEMORY) {
|
||||||
FREELIST(conflicts);
|
FREELIST(conflicts);
|
||||||
if(dbpkg) {
|
if(dbpkg) {
|
||||||
|
@ -838,11 +838,11 @@ static int sync_trans(alpm_list_t *targets)
|
|||||||
for(i = data; i; i = alpm_list_next(i)) {
|
for(i = data; i; i = alpm_list_next(i)) {
|
||||||
alpm_fileconflict_t *conflict = alpm_list_getdata(i);
|
alpm_fileconflict_t *conflict = alpm_list_getdata(i);
|
||||||
switch(conflict->type) {
|
switch(conflict->type) {
|
||||||
case PM_FILECONFLICT_TARGET:
|
case ALPM_FILECONFLICT_TARGET:
|
||||||
printf(_("%s exists in both '%s' and '%s'\n"),
|
printf(_("%s exists in both '%s' and '%s'\n"),
|
||||||
conflict->file, conflict->target, conflict->ctarget);
|
conflict->file, conflict->target, conflict->ctarget);
|
||||||
break;
|
break;
|
||||||
case PM_FILECONFLICT_FILESYSTEM:
|
case ALPM_FILECONFLICT_FILESYSTEM:
|
||||||
printf(_("%s: %s exists in filesystem\n"),
|
printf(_("%s: %s exists in filesystem\n"),
|
||||||
conflict->target, conflict->file);
|
conflict->target, conflict->file);
|
||||||
break;
|
break;
|
||||||
|
@ -170,11 +170,11 @@ int pacman_upgrade(alpm_list_t *targets)
|
|||||||
for(i = data; i; i = alpm_list_next(i)) {
|
for(i = data; i; i = alpm_list_next(i)) {
|
||||||
alpm_fileconflict_t *conflict = alpm_list_getdata(i);
|
alpm_fileconflict_t *conflict = alpm_list_getdata(i);
|
||||||
switch(conflict->type) {
|
switch(conflict->type) {
|
||||||
case PM_FILECONFLICT_TARGET:
|
case ALPM_FILECONFLICT_TARGET:
|
||||||
printf(_("%s exists in both '%s' and '%s'\n"),
|
printf(_("%s exists in both '%s' and '%s'\n"),
|
||||||
conflict->file, conflict->target, conflict->ctarget);
|
conflict->file, conflict->target, conflict->ctarget);
|
||||||
break;
|
break;
|
||||||
case PM_FILECONFLICT_FILESYSTEM:
|
case ALPM_FILECONFLICT_FILESYSTEM:
|
||||||
printf(_("%s: %s exists in filesystem\n"),
|
printf(_("%s: %s exists in filesystem\n"),
|
||||||
conflict->target, conflict->file);
|
conflict->target, conflict->file);
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user