From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 014E415808B for ; Sat, 12 Feb 2022 17:13:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FA9DE07F0; Sat, 12 Feb 2022 17:13:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 361BCE07F0 for ; Sat, 12 Feb 2022 17:13:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 553A9342EAD for ; Sat, 12 Feb 2022 17:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BA772D7 for ; Sat, 12 Feb 2022 17:13:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1644685722.ea84ef6ee024de6a24e0ee2f0cf557213a05c6b9.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ea84ef6ee024de6a24e0ee2f0cf557213a05c6b9 X-VCS-Branch: master Date: Sat, 12 Feb 2022 17:13:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18aa8fe9-a9b0-4d26-a0f0-e4e17edbce36 X-Archives-Hash: 300231de96dad6c01f55118ab808cee3 commit: ea84ef6ee024de6a24e0ee2f0cf557213a05c6b9 Author: Fabian Groffen gentoo org> AuthorDate: Sat Feb 12 17:08:42 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Feb 12 17:08:42 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ea84ef6e qmerge: fix Coverity dead code CID 248871 we previously checked rpkg == NULL, so indeed it can never be !NULL (copy 'n' paste error) Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qmerge.c b/qmerge.c index c41b095..a64447e 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1523,12 +1523,12 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, depend_atom *rpkg, set *keep, if (!pretend && rpkg == NULL) { buf = tree_pkg_meta_get(pkg_ctx, EAPI); if (buf == NULL) - buf = "0"; /* default */ + buf = (char *)"0"; /* default */ phases = tree_pkg_meta_get(pkg_ctx, DEFINED_PHASES); if (phases != NULL) { mkdirat(pkg_ctx->fd, "temp", 0755); pkg_run_func_at(pkg_ctx->fd, ".", phases, PKG_PRERM, - T, T, buf, rpkg == NULL ? "" : rpkg->PVR); + T, T, buf, ""); } } @@ -1664,7 +1664,7 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, depend_atom *rpkg, set *keep, buf = tree_pkg_meta_get(pkg_ctx, EAPI); phases = tree_pkg_meta_get(pkg_ctx, DEFINED_PHASES); if (buf == NULL) - buf = "0"; /* default */ + buf = (char *)"0"; /* default */ if (phases != NULL) { /* execute the pkg_postrm step */ pkg_run_func_at(pkg_ctx->fd, ".", phases, PKG_POSTRM,