mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
Rename pmfileconflicttype_t to alpm_fileconflicttype_t
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
0a80cf31cf
commit
1c5c7c907c
@ -81,10 +81,10 @@ typedef enum _alpm_depmod_t {
|
|||||||
* Whether the conflict results from a file existing on the filesystem, or with
|
* Whether the conflict results from a file existing on the filesystem, or with
|
||||||
* another target in the transaction.
|
* another target in the transaction.
|
||||||
*/
|
*/
|
||||||
typedef enum _pmfileconflicttype_t {
|
typedef enum _alpm_fileconflicttype_t {
|
||||||
PM_FILECONFLICT_TARGET = 1,
|
PM_FILECONFLICT_TARGET = 1,
|
||||||
PM_FILECONFLICT_FILESYSTEM
|
PM_FILECONFLICT_FILESYSTEM
|
||||||
} pmfileconflicttype_t;
|
} alpm_fileconflicttype_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GPG signature verification options
|
* GPG signature verification options
|
||||||
@ -131,7 +131,7 @@ typedef struct _pmconflict_t {
|
|||||||
/** File conflict */
|
/** File conflict */
|
||||||
typedef struct _pmfileconflict_t {
|
typedef struct _pmfileconflict_t {
|
||||||
char *target;
|
char *target;
|
||||||
pmfileconflicttype_t type;
|
alpm_fileconflicttype_t type;
|
||||||
char *file;
|
char *file;
|
||||||
char *ctarget;
|
char *ctarget;
|
||||||
} pmfileconflict_t;
|
} pmfileconflict_t;
|
||||||
|
@ -281,7 +281,7 @@ static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB,
|
|||||||
* a wrapper for former functionality that was done inline.
|
* a wrapper for former functionality that was done inline.
|
||||||
*/
|
*/
|
||||||
static alpm_list_t *add_fileconflict(pmhandle_t *handle,
|
static alpm_list_t *add_fileconflict(pmhandle_t *handle,
|
||||||
alpm_list_t *conflicts, pmfileconflicttype_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;
|
pmfileconflict_t *conflict;
|
||||||
|
Loading…
Reference in New Issue
Block a user