bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename pmfileconflict_t to alpm_fileconflict_t

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-28 14:35:17 +10:00
parent 220842b37b
commit 37b6cceed4
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/alpm.h
View file

@ -129,12 +129,12 @@ typedef struct _alpm_conflict_t {
} alpm_conflict_t; } alpm_conflict_t;
/** File conflict */ /** File conflict */
typedef struct _pmfileconflict_t { typedef struct _alpm_fileconflict_t {
char *target; char *target;
alpm_fileconflicttype_t type; alpm_fileconflicttype_t type;
char *file; char *file;
char *ctarget; char *ctarget;
} pmfileconflict_t; } alpm_fileconflict_t;
/** Package group */ /** Package group */
typedef struct _pmgrp_t { typedef struct _pmgrp_t {

8
lib/libalpm/conflict.c
View file

@ -275,7 +275,7 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB,
return ret; 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 * (either PM_FILECONFLICT_TARGET or PM_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.
@ -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, alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr,
const char *name1, const char *name2) const char *name1, const char *name2)
{ {
pmfileconflict_t *conflict; alpm_fileconflict_t *conflict;
MALLOC(conflict, sizeof(pmfileconflict_t), goto error); MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error);
conflict->type = type; conflict->type = type;
STRDUP(conflict->target, name1, goto error); STRDUP(conflict->target, name1, goto error);
@ -306,7 +306,7 @@ error:
RET_ERR(handle, PM_ERR_MEMORY, conflicts); 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->ctarget);
FREE(conflict->file); FREE(conflict->file);

2
lib/libalpm/conflict.h
View file

@ -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 *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
alpm_list_t *upgrade, alpm_list_t *remove); 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 */ #endif /* _ALPM_CONFLICT_H */

2
src/pacman/sync.c
View file

@ -836,7 +836,7 @@ static int sync_trans(alpm_list_t *targets)
switch(err) { switch(err) {
case PM_ERR_FILE_CONFLICTS: case PM_ERR_FILE_CONFLICTS:
for(i = data; i; i = alpm_list_next(i)) { 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) { switch(conflict->type) {
case PM_FILECONFLICT_TARGET: case PM_FILECONFLICT_TARGET:
printf(_("%s exists in both '%s' and '%s'\n"), printf(_("%s exists in both '%s' and '%s'\n"),

2
src/pacman/upgrade.c
View file

@ -168,7 +168,7 @@ int pacman_upgrade(alpm_list_t *targets)
switch(err) { switch(err) {
case PM_ERR_FILE_CONFLICTS: case PM_ERR_FILE_CONFLICTS:
for(i = data; i; i = alpm_list_next(i)) { 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) { switch(conflict->type) {
case PM_FILECONFLICT_TARGET: case PM_FILECONFLICT_TARGET:
printf(_("%s exists in both '%s' and '%s'\n"), printf(_("%s exists in both '%s' and '%s'\n"),