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 C857E15808B for ; Sat, 12 Feb 2022 18:31:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEEF7E077A; Sat, 12 Feb 2022 18:31:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D637AE077A for ; Sat, 12 Feb 2022 18:31:14 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAB74335DB2 for ; Sat, 12 Feb 2022 18:31:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B5672A0 for ; Sat, 12 Feb 2022 18:31:12 +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: <1644689050.618db8bdc8f82972815a9f717a4be0df71f0e52c.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qlop.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 618db8bdc8f82972815a9f717a4be0df71f0e52c X-VCS-Branch: master Date: Sat, 12 Feb 2022 18:31:12 +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: 4ef94947-0c60-4e7e-b87d-db24f021975b X-Archives-Hash: 892a4dfda607444962ce1107a66ae767 commit: 618db8bdc8f82972815a9f717a4be0df71f0e52c Author: Fabian Groffen gentoo org> AuthorDate: Sat Feb 12 18:04:10 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Feb 12 18:04:10 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=618db8bd qlop: fix Coverity condition always true CID 248869 atom->pfx_op cannot be 2 values at the same time so, pfx_op != X || pfx_op != Y has to be always true fix it to turn into and condition, which makes more sense in the code flow Signed-off-by: Fabian Groffen gentoo.org> qlop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qlop.c b/qlop.c index afa4c19..addb4b3 100644 --- a/qlop.c +++ b/qlop.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2021 Gentoo Foundation + * Copyright 2005-2022 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2010 Ned Ludd - @@ -1259,7 +1259,7 @@ static int do_emerge_log( continue; } case NEWER: - if (atom->pfx_op != ATOM_OP_NEWER || + if (atom->pfx_op != ATOM_OP_NEWER && atom->pfx_op != ATOM_OP_NEWER_EQUAL) continue; /* fall through */