From nobody Tue Dec 9 16:33:04 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 4dQkt82ZKGz6J9CV for ; Tue, 09 Dec 2025 16:33:04 +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 4dQkt80sxLz3HHq for ; Tue, 09 Dec 2025 16:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765297984; 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=mMBXxzelOCY7Pf/XvH+Y/WZZr+1CIjSjP6EZGMzavfE=; b=wugyIf/UdlKzosxYK6fPg7m5Nyskhjrjl3u3HQ37r9S1DdWYH6gFu6hMS1hjywCk+u+CYn pW2zOtMVrcQW6f1C9gZ2yZ7LqUiBPkYIG6zTYndioEcoUgg6n5nkHxRhCLOdKcXpIcKIrF iePNFHxL9XSZR5UINtMxdpfrU4U6JMSp1Iv1WTnLGGPc0G4O2DIiYgK/UXc+pOkTQkPKSX Za6UEnDckDFhbAjRJW8eDWXv4uRewZMrvipAOKcVkKL4J0PSQe+bZnv+bl6+Sj+ZJuXkjB kA1K8cIh5OCk0RAKXpQ4ly+rcoP4mdNnbzLT/jbiSH/aCz9bvGPndOE4HLB91g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765297984; 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=mMBXxzelOCY7Pf/XvH+Y/WZZr+1CIjSjP6EZGMzavfE=; b=lWoscvZZAYkKvaaGppj1/vFB0TlKquDGPwmcJsprJC8fzV6kGCjssGRZD4FgBDbHjUypzZ MVuzSTfpX5M4zSsbwkrfLNKckrpf92Iuu6yt+wDlIWF0YeThZuSED45rYey2gFuMp10HQC eBebColkPchB1+QvGJTNUryhdxjP/QkYrrF/BZGmLg7PIn68iZ1Mquc8c/BIxRC4M/y6vJ 0wcl7ee7AUUDnPj0ShlHodZp1D/Xtz68l+9Sfp2hAGgkR0dJYjrdu/jdE8KAquqZWqmvNR MbXGv+rT7CnKNwFoXnVdF68YgAHdPF6TEf7htGXqGxIRHNJcGWxt7CjypLw7SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765297984; a=rsa-sha256; cv=none; b=Ak+VyFGpWWpYtBvJkM+9e9I4qagwEBRpCkOkguITFj1JAfmTESv/ffwUSmIfsHIaNbIa1W JvG9868qrieoAohcPIioGDac+vMX0aD906KEkg8TE4JCesLTEsvlcgKpnkmayvT4/akTRu BIFN5m+o7754WtR0c/1foDQ6xMIu/7msoJB1hPfAHZw8TM/70TVc5PDeYXUCIuE6/J7bA9 Ks+ZTKznIg6M1day45fusOqKp0VmhhMG0ihJdrC8liuvy+GEBI9kFJdNYeJAJYUWEOf07w LEOSiuMMDDMkorSL8llA+EsCm7GWRXoI/xtBN9H/ZCrBq0fL+dp2EbIKh5lMWA== 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 4dQkt80QPwz16Jp for ; Tue, 09 Dec 2025 16:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9e83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 16:33:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 56bdfd2d967a - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 56bdfd2d967ac104dc599bced168e1a200aa168e Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 16:33:04 +0000 Message-Id: <69384f40.9e83.e16d401@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=56bdfd2d967ac104dc599bced168e1a200aa168e commit 56bdfd2d967ac104dc599bced168e1a200aa168e Author: Ed Maste AuthorDate: 2025-11-18 13:20:40 +0000 Commit: Ed Maste CommitDate: 2025-12-09 16:32:09 +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) --- 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. */