From nobody Tue Nov 18 18:55:36 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 4d9v2K2MG1z6HbZr for ; Tue, 18 Nov 2025 18:55:37 +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 4d9v2J6QWLz3VH5 for ; Tue, 18 Nov 2025 18:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763492136; 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=kKILXcX+L+/Qd+/QFJzd9QNlxDnJ5CK+55INdI9Z8/s=; b=tUTzBIjUwQirStcDa6X0YKErhv7AYuspy08TdcB3Ee2ewPnKXLekIUFWcAR5APUk50rHjP 92VrVfTLcxyvwayvGTjFvG8D4npW7ttdXSICauYIg2+NJ9YkcbHtktHS8I3TyNC95wfiyq 6Qc5OC8Yi3sIFdLGt2WF6SvooUDHp+y7kv49WklY4zBLEnqESFZVeAkDNjyRiIpkj5e6iT LxAlz0dl4ZVaVYdTzJklw9dKmYztrCt32jEzWQtlw/+p9AJ9cw1rKnc5uDOH0c96kEB8Kt WCZT7GCOnpHR1qkkq6DjpbfoubM9ENfXaFn30x2d8p2QhAG28ITk8VBPEpiFWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763492136; 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=kKILXcX+L+/Qd+/QFJzd9QNlxDnJ5CK+55INdI9Z8/s=; b=jjwhqN5wFYYrnNyW2j0r8skmLI+KhIKwkCXUkotF8966tpxDwt8uh7b5r9C8m0hdcMhibI UsWJqWRN11EpurYsnFff2sx+Jn5plzYNdQBZBQ4DsxuJ6XM2IGUuvM1Z2YJGi71KFwtXPW Rm3lzeD8w5OGNh0rWh8Ix+249Cg1RvnyFD685WdQLxUFCUOrKhFw2ipBi/hNTflXISuXQc 5KIkGyyhqNCSIciCl0922tPN13vTVUY7trvKzaxUscm+J/qI99BmLhS6ysRz7OOgXr5pmg uFGJWOlwcqLIE178Rjkq8jGLI5oWq6gyX/qPWVW8nMUzSqJBVXm236S5GihLvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763492136; a=rsa-sha256; cv=none; b=LLTbgNjYva6jzrtN51NOikNzwwH9HdSgnzUlVeR/PGcJr4EMCCYv50NdxVafYkuetthvHX NEtKW0Bfok4sXsbImD3PW8smU482UkW1iQfM4/dl0s/7ZDYst/cfmrsrwQA4Mq9rdV2jie BEUvBESnXaTK1BGG4BsZyYbXBhX4bDKGbaVuvDy4tKKtsIwqVwTuVpirhol9i5weLHalO6 NBdBUhPwM6HyDJ+X+BptBkI6SElCpSs+vQF/69E658rorAhVM6QLn748ClE3w1QJODUD42 c+vEPHUFBIv9fZCZUIkRXF6fCA0VWfJYTQW1ZqjpiiHs3PI1cjQtvnvb9a254g== 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 4d9v2J5QgSz15lZ for ; Tue, 18 Nov 2025 18:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28783 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:55:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: abcb80f46c26 - main - 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/main X-Git-Reftype: branch X-Git-Commit: abcb80f46c2607fc16564ca87cc25f0908f29f99 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:55:36 +0000 Message-Id: <691cc128.28783.585613ea@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=abcb80f46c2607fc16564ca87cc25f0908f29f99 commit abcb80f46c2607fc16564ca87cc25f0908f29f99 Author: Ed Maste AuthorDate: 2025-11-18 13:20:40 +0000 Commit: Ed Maste CommitDate: 2025-11-18 18:53:24 +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 --- 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. */