From nobody Wed May 25 14:08:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 433811B4C615; Wed, 25 May 2022 14:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7Xwl0nccz3ll9; Wed, 25 May 2022 14:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653487719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=toB6rnYSOHqAW9vlC1w05KjWuWEc8IDEb1L4tpD+Xio=; b=CsLJhcAONll9Z4BywTTyFrak+FJ9eYb/qr4pOuBNTYN5I9Lj5ChfY+qZxRD3BegDstzJQb t5X0FIezS+T4vSmJ3eSVpNFLhkJ3IE4eamPjPXd2g/cBZgiWYX+wDahydKsQaWOdIv9tPB rflEKZsaSvQjxudxeRgPL/9AEXWolNJ657LLIM2++JEH56ESZ4mGTHB/okGj0AupJGEzhD 8xR/l6dGJbDG/7spqhTemEtudu1crmVm24rzOXVBs0oMqhpIUxtGrKfzF36ubqzHbBv9Hd ZVkpurQJfyE8mxPrWP1l6gPtRA812x3rZQgVCpKpzr8JK6+ZfodC0+IOK6Tqtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF23F1AAAA; Wed, 25 May 2022 14:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24PE8cm2025064; Wed, 25 May 2022 14:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24PE8cnJ025062; Wed, 25 May 2022 14:08:38 GMT (envelope-from git) Date: Wed, 25 May 2022 14:08:38 GMT Message-Id: <202205251408.24PE8cnJ025062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 7d975c7f93f1 - main - diff3: Don't perform a bitwise OR when comparing diffs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d975c7f93f16209f0e6417ebd178d8538eb0633 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653487719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=toB6rnYSOHqAW9vlC1w05KjWuWEc8IDEb1L4tpD+Xio=; b=mbIpvhbhCVD3m1b3/GnA24Wn1SOHGc4S0QikGJkqofK0lztRirw59OrEtlun2FaS4jCttz uwPxTDXZyCZJfcWZXUy5tl083nFvPr1yp86pnRmC0MMGrU0xwxa8YVNJ0JwTfpbo9dbHbh 7pw+6n7cUs3ufJkGTkYi7U06Cw5ZwBy3mFUtzEnVwLpm+Ljsc8LR9v1oXNfDV2nmUq5MVk O4R5OdEsw8jWnRcvNPn8FQnv7ZrCu0DgRGt4mFXYKsw3PDbNTAmkg5/jVGqh+QVYpy8blJ lHdDdgO6wiGw197J/QOT/gg6SqCbVYffntiB6/3UiqVbCi64wgFwkSDXaJG6rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653487719; a=rsa-sha256; cv=none; b=MbfwTgLxIZN+7GdxyeYCXl4rdGVmBJDKhgIo4m3vZNtFlxx2R/tnc5oQgFJ142tn2ZRMvu 9/aRw5lZAj9P7uq8vRaOQqNy4kkCdESJEb87BsKJqn6jC7oH4GzVW4rvZ8sbOpeRh9c9gq 8ceSlaR1M3yOeSC+wSKSWlJWQZuKF+rozov7pXLm2wzM1TZEvAy2bxB9kklUoKOLITGw2d oq9MAU6owVkHOgThTX+7WXnwEx9cylt0SFyv2XI74cuB74JXiwVL3XXa+y9Rbi4pe5HdEO AnJ5AKpcSCDjstFfIho4ibZjXlwIY74hcGANWiOUB5xO2wgqQ3fli+1jc/1xFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d975c7f93f16209f0e6417ebd178d8538eb0633 commit 7d975c7f93f16209f0e6417ebd178d8538eb0633 Author: Tom Jones AuthorDate: 2022-05-25 13:41:43 +0000 Commit: Tom Jones CommitDate: 2022-05-25 13:43:14 +0000 diff3: Don't perform a bitwise OR when comparing diffs This fixes the build now that it uses -Wbitwise-instead-of-logical Sponsored by: Klara Inc. --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 629e23288875..c7756f35bfe2 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -304,7 +304,7 @@ merge(int m1, int m2) d2 = d23; j = 0; - while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) { + while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) { /* first file is different from the others */ if (!t2 || (t1 && d1->new.to < d2->new.from)) { /* stuff peculiar to 1st file */