From nobody Thu Feb 26 04:22:47 2026 X-Original-To: dev-commits-src-branches@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 4fLyx34lNRz6TFG8 for ; Thu, 26 Feb 2026 04:22:47 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyx32RqYz3Jg7 for ; Thu, 26 Feb 2026 04:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772079767; 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=T2Qu62eIBSD/HXrmvxaSoWy0ZnZfwwiYOlQfVl7i0JI=; b=SApymLe5P1VeIN6sJepUcgc6Sg0IVmJiEXUaIV0L+ZrCtpa3MAhZNBuLsWhvwoNVHzFtL8 6D9RdQwfh1vqXQNKV1sldS9tRtmE/1eoKw2cq1P/KCMQ3LIMkl67GgocT2/lbX9NLA1wMm IymXaU82Pp58nA51G7FwOGaeeH5WWaIWAGGMU5awBQW87v7aWCjhr+Yt8fsHM5B40tQ+AF 0zo2QMFTKWRRdRl2AkwzpUfJlHBbzh+2I0Wbr06T/RiNLzu/k5yKtF2tHBuAGS6i/Z67e/ qwA+bxx+Bc6fCFqDNt7CVn3ESjy4fhXmX2POdysXf1DV0KEGveaBY/sb1fbjKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772079767; a=rsa-sha256; cv=none; b=ZKnPA4Q+umZzEl7QR4o25kExBaZws7AiPpRD3FBsqkbf9+QY9nqBbNQ63cp0eD7E73Motc afdVGZo0YAqph7N7PNoxvowUf8EgG3GC+s+6o/58DGd9qTPEg6uZOay8RI4JiTizFxwXlP E0OlUYHkbDxrZRuiLwDVToq1B2/66SNIfb/scbPgmA5QeyuWH4T3aWmZFDSm/qvDabd/Dy ZiHrjAHRT1XMhgSIzLAbI9RPOqfZkpWH4pUxA8UU0T+/EDz8Cq9nl6W5HMoZxvtdY/UT9y PKYOhd8onofPcXt/c0hHtpwUCZq4OvzmXRmqcrMPnLSuY/nx2WdzDaQcS4BggA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772079767; 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=T2Qu62eIBSD/HXrmvxaSoWy0ZnZfwwiYOlQfVl7i0JI=; b=sC+mgLt4r+DULMhGJrx4aFPWpQ/ro332edq8wd3mdlDEjNiY8pc2vR7GpdriFJiE5dSiXs 0NE7BWSlWrB9sOVycKlTaQ1eedTMZSDGF8qFn9CAeGIEio+9lnTxmViBobK5fwJUnOKYY6 s+XY5KCWWTx99zHwVhiQMde28PRtB0bcdL1ny2sLWmiO5hW8EGObl0spP9zmRC+zG72bRP tjGSPUxY8YycmXl7yEH1nZR6UJJP5tIM/jGC20e47U+l7txim/e6uaBdAVqNb7QRe7dSHQ eF5Ym+6kkyYoLR18B+PTHFXlIuyUpmTaQVNg8jBRU6BytPENoC6pDxbO2OCHbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyx322mbz1LF for ; Thu, 26 Feb 2026 04:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 334f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 04:22:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d58ab2ad9499 - stable/15 - diff: Drop unnecessary casts, fix none algo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d58ab2ad94994f9d13e1f323caea0a646ff025a7 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 04:22:47 +0000 Message-Id: <699fca97.334f6.16c578f8@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d58ab2ad94994f9d13e1f323caea0a646ff025a7 commit d58ab2ad94994f9d13e1f323caea0a646ff025a7 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 18:28:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-26 04:02:28 +0000 diff: Drop unnecessary casts, fix none algo MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55349 (cherry picked from commit d5404462f691230423dc8cc543c6fdc44f34ec31) --- usr.bin/diff/diffreg_new.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index 29882923cd0e..69deae497962 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -56,7 +56,7 @@ static const struct diff_algo_config myers_then_myers_divide; static const struct diff_algo_config patience; static const struct diff_algo_config myers_divide; -static const struct diff_algo_config myers_then_patience = (struct diff_algo_config){ +static const struct diff_algo_config myers_then_patience = { .impl = diff_algo_myers, .permitted_state_size = 1024 * 1024 * sizeof(int), .fallback_algo = &patience, @@ -69,7 +69,7 @@ static const struct diff_algo_config myers_then_myers_divide = .fallback_algo = &myers_divide, }; -static const struct diff_algo_config patience = (struct diff_algo_config){ +static const struct diff_algo_config patience = { .impl = diff_algo_patience, /* After subdivision, do Patience again: */ .inner_algo = &patience, @@ -77,14 +77,14 @@ static const struct diff_algo_config patience = (struct diff_algo_config){ .fallback_algo = &myers_then_myers_divide, }; -static const struct diff_algo_config myers_divide = (struct diff_algo_config){ +static const struct diff_algo_config myers_divide = { .impl = diff_algo_myers_divide, /* When division succeeded, start from the top: */ .inner_algo = &myers_then_myers_divide, /* (fallback_algo = NULL implies diff_algo_none). */ }; -static const struct diff_algo_config no_algo = (struct diff_algo_config){ +static const struct diff_algo_config none = { .impl = diff_algo_none, }; @@ -109,8 +109,9 @@ static const struct diff_config diff_config_patience = { }; /* Directly force Patience as a first divider of the source file. */ -static const struct diff_config diff_config_no_algo = { +static const struct diff_config diff_config_none = { .atomize_func = diff_atomize_text_by_line, + .algo = &none, }; const char * @@ -174,7 +175,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) cfg = &diff_config_patience; break; case DIFFREG_ALGO_NONE: - cfg = &diff_config_no_algo; + cfg = &diff_config_none; break; }