index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Allan McRae <allan@archlinux.org> | 2010-07-07 16:58:51 +1000 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2010-08-23 21:49:05 -0500 |
commit | 48589ccc64c5e7266f70c6294087e8b0450953e9 (patch) | |
tree | bf6137c4ac190d71905a094db26f72624cbe923f /lib/libalpm/conflict.c | |
parent | d896527d21107afe69328ac465a3d2f0e318ddca (diff) |
-rw-r--r-- | lib/libalpm/conflict.c | 2 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 236ec1df..694c38db 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -321,7 +321,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) */ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts, pmfileconflicttype_t type, const char *filestr, - const char* name1, const char* name2) + const char* name1, const char* name2) { pmfileconflict_t *conflict; MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); |