From nobody Tue Dec 16 15:49:58 2025 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 4dW1bC05p7z6L8Gx for ; Tue, 16 Dec 2025 15:49:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dW1bB5y8fz3xBR for ; Tue, 16 Dec 2025 15:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765900198; 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=Jhi+6dUsXSUrEXlDXhheGPUYAqXOukOY3HAJO0WGsXA=; b=G21oX+Uo6XzfoXEM9yFdnU/pfHWiBUZ039Zx/4HD3tudDnFzUsGG/2BOt5I5FNqGfusNn9 9k/Vmd0IFaRRSc1AkSxc4oD7U+5iL4KcJWHI4fvXVoFeFiiHg8/6nT/ajSCNA77Xw8AGfy RkkDZK6iurncZp7GDvTnUAe9E8IXp7GzT5keVUvttcKcIbAUSLxC6lBa8Ado898LizRhB7 t8eAlE1u2VLchFYzLFHBoQuNPEDGqpQy8krQJCfPXw6ZL5Z/y0F/5bNo3wTiUk+AcWJieR qQdOlUb9NT7K5d2wuHU7Q+5a/3sE8Ge2AEONpnT/v2w9sHvJuY3cL4PKQJhUAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765900198; 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=Jhi+6dUsXSUrEXlDXhheGPUYAqXOukOY3HAJO0WGsXA=; b=NkAzeFL0BxebDV2lEuIyfm2g69bdgc6kQtN8grEcOyhGvTU6UlFCTRKlLhBZPegajwL7qj IMbhZVcP2wlEyuMYauszdwKsjua0X7+P9GxtziCf+X9EOO4fwAuDXp4cejPv1U4lcmrJvn vfD8JuYVhe58PN1XtfpmK0cZhxUeBWqcQy3E/9BAw++k5NLq1oG0nWnlR7xWKaQQyQ21yo 75wNGb/woB+0UaSE63P3NTFV1S6uGFu9j1FF+X2sAMhzBDnMt7jU8bGrSAcPTSkjzXmZmY v/kFbgu2/v1TljFYdkN3Nh/MRcHlz9rQV3UPeFtvxnvlx6hHlH8OQfrDC8c/6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765900198; a=rsa-sha256; cv=none; b=QsK+gKoALykcKBAU0adgMhaUxfj2vz0/n5RxdSzyfmTTh7jk1RhzGqup6ySdvym0G46tYD 3Fd2XoGg8F45oCzbt5rNI31GfBaDPKWqJ9VULZXYtbLueeylVihuqJ5jIDAU0EmLNbwWaO /eC/qrukwxUXlCkICSWOnKtd1s9zVps3lXFlorz7cunQOY8Ky5BWLK7iflS/1Cg0Py5SYp +63dQ4qnrJLWZC/L4i3/8nt7dDwKHf2ALZikHL3jMimPaPIlt+i+Oy0ntBs248lkGq9cyy nT7QIYegh84Ix1mscuIZs90TUli/ga+K6Pjx37QyHThV9oePXjzV0/B9uJ001g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dW1bB5Xwfz1BWQ for ; Tue, 16 Dec 2025 15:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43890 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 15:49:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 98d08b86b4e5 - stable/14 - diff3: Use logical-not, not bitwise for booleans 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98d08b86b4e5b77fa1401d4a44ec3ecc7b13f1b0 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 15:49:58 +0000 Message-Id: <69417fa6.43890.5c57f45@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=98d08b86b4e5b77fa1401d4a44ec3ecc7b13f1b0 commit 98d08b86b4e5b77fa1401d4a44ec3ecc7b13f1b0 Author: Ed Maste AuthorDate: 2025-11-18 13:20:40 +0000 Commit: Ed Maste CommitDate: 2025-12-16 15:49:25 +0000 diff3: Use logical-not, not bitwise for booleans And compare impcompat != 0 as it's actually an integer incremented on each use of one of the AeExX3 options. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53808 (cherry picked from commit abcb80f46c2607fc16564ca87cc25f0908f29f99) (cherry picked from commit 56bdfd2d967ac104dc599bced168e1a200aa168e) --- contrib/diff/src/diff3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c index c915d6b04c87..d0e8137756db 100644 --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -299,9 +299,9 @@ main (int argc, char **argv) } } - edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */ - show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */ - flagging |= ~incompat & merge; + edscript = (incompat != 0) & !merge; /* -AeExX3 without -m implies ed script. */ + show_2nd |= !incompat & merge; /* -m without -AeExX3 implies -A. */ + flagging |= !incompat & merge; if (incompat > 1 /* Ensure at most one of -AeExX3. */ || finalwrite & merge /* -i -m would rewrite input file. */