From 8b35654474542ea52393e7acf346e4c3b94c0ee5 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 9 Dec 2021 20:14:33 +0000 Subject: [PATCH] libalpm: use null for no alpm_fileconflict_t->ctarget --- lib/libalpm/conflict.c | 1 - src/pacman/sync.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b471bf21..046bd095 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -269,7 +269,6 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, STRDUP(conflict->file, filestr, goto error); if(!pkg2) { conflict->type = ALPM_FILECONFLICT_FILESYSTEM; - STRDUP(conflict->ctarget, "", goto error); } else if(pkg2->origin == ALPM_PKG_FROM_LOCALDB) { conflict->type = ALPM_FILECONFLICT_FILESYSTEM; STRDUP(conflict->ctarget, pkg2->name, goto error); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b6da1a36..7bc53893 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -840,7 +840,7 @@ int sync_prepare_execute(void) conflict->file, conflict->target, conflict->ctarget); break; case ALPM_FILECONFLICT_FILESYSTEM: - if(conflict->ctarget[0]) { + if(conflict->ctarget) { printf(_("%s: %s exists in filesystem (owned by %s)\n"), conflict->target, conflict->file, conflict->ctarget); } else {