diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 06:33:55 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 15:28:23 +0200 |
| commit | 220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (patch) | |
| tree | a2ceee8059e1809996c4023c8ff31ad25552fb85 /src | |
| parent | 6d876f9b6be055d54e50d42a34c267aad64c0b21 (diff) | |
| download | pacman-220842b37ba484a452f5e4d8071d91d3f2b6c2d4.tar.gz pacman-220842b37ba484a452f5e4d8071d91d3f2b6c2d4.tar.xz | |
Rename pmconflict_t to alpm_conflict_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 2 | ||||
| -rw-r--r-- | src/util/testdb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 659396cd..f0d7dba8 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -783,7 +783,7 @@ static int sync_trans(alpm_list_t *targets) break; case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { - pmconflict_t *conflict = alpm_list_getdata(i); + alpm_conflict_t *conflict = alpm_list_getdata(i); /* only print reason if it contains new information */ if(strcmp(conflict->package1, conflict->reason) == 0 || strcmp(conflict->package2, conflict->reason) == 0) { diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 67860277..1fa538da 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -118,7 +118,7 @@ int pacman_upgrade(alpm_list_t *targets) break; case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { - pmconflict_t *conflict = alpm_list_getdata(i); + alpm_conflict_t *conflict = alpm_list_getdata(i); if(strcmp(conflict->package1, conflict->reason) == 0 || strcmp(conflict->package2, conflict->reason) == 0) { printf(_(":: %s and %s are in conflict\n"), diff --git a/src/util/testdb.c b/src/util/testdb.c index fff43a22..38067911 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -118,7 +118,7 @@ static int checkconflicts(alpm_list_t *pkglist) /* check conflicts */ data = alpm_checkconflicts(handle, pkglist); for(i = data; i; i = i->next) { - pmconflict_t *conflict = alpm_list_getdata(i); + alpm_conflict_t *conflict = alpm_list_getdata(i); printf("%s conflicts with %s\n", conflict->package1, conflict->package2); ret++; |