Rename pmfileconflict_t to alpm_fileconflict_t

Signed-off-by: Allan McRae <allan@archlinux.org>

5 files changed, 9 insertions, 9 deletions

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index ff966f18..90bb5405 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -129,12 +129,12 @@ typedef struct _alpm_conflict_t {
 } alpm_conflict_t;
 
 /** File conflict */
-typedef struct _pmfileconflict_t {
+typedef struct _alpm_fileconflict_t {
 	char *target;
 	alpm_fileconflicttype_t type;
 	char *file;
 	char *ctarget;
-} pmfileconflict_t;
+} alpm_fileconflict_t;
 
 /** Package group */
 typedef struct _pmgrp_t {
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 83a1fa5f..e54c7147 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -275,7 +275,7 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB,
 	return ret;
 }
 
-/* Adds pmfileconflict_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
  * string, and either two package names or one package name and NULL. This is
  * a wrapper for former functionality that was done inline.
@@ -284,8 +284,8 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle,
 		alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr,
 		const char *name1, const char *name2)
 {
-	pmfileconflict_t *conflict;
-	MALLOC(conflict, sizeof(pmfileconflict_t), goto error);
+	alpm_fileconflict_t *conflict;
+	MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error);
 
 	conflict->type = type;
 	STRDUP(conflict->target, name1, goto error);
@@ -306,7 +306,7 @@ error:
 	RET_ERR(handle, PM_ERR_MEMORY, conflicts);
 }
 
-void _alpm_fileconflict_free(pmfileconflict_t *conflict)
+void _alpm_fileconflict_free(alpm_fileconflict_t *conflict)
 {
 	FREE(conflict->ctarget);
 	FREE(conflict->file);
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 4edbe620..6c13cb28 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -31,7 +31,7 @@ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages);
 alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 		alpm_list_t *upgrade, alpm_list_t *remove);
 
-void _alpm_fileconflict_free(pmfileconflict_t *conflict);
+void _alpm_fileconflict_free(alpm_fileconflict_t *conflict);
 
 #endif /* _ALPM_CONFLICT_H */
 
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index f0d7dba8..418cda1d 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -836,7 +836,7 @@ static int sync_trans(alpm_list_t *targets)
 		switch(err) {
 			case PM_ERR_FILE_CONFLICTS:
 				for(i = data; i; i = alpm_list_next(i)) {
-					pmfileconflict_t *conflict = alpm_list_getdata(i);
+					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
 						case PM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 1fa538da..7f6e0986 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -168,7 +168,7 @@ int pacman_upgrade(alpm_list_t *targets)
 		switch(err) {
 			case PM_ERR_FILE_CONFLICTS:
 				for(i = data; i; i = alpm_list_next(i)) {
-					pmfileconflict_t *conflict = alpm_list_getdata(i);
+					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
 						case PM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),