From nobody Fri Nov 14 04:12:12 2025 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 4d73cs3Bg1z6GrKB; Fri, 14 Nov 2025 04:12:13 +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 4d73cs06WSz3Gww; Fri, 14 Nov 2025 04:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093533; 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=PFkuvm4ASQLb76F5ypKtwqPztY0M/qizJnhi2Jt4bDM=; b=ZmiYrmQrB/wkWRS8lSf2yGnq3cdv9ulfnkuTaa4eqYoBohoFW6CBLPkQtxu9RjkZhDtRBs xFc4Pb8ZKeiaDHMbxlkqZXEj0fMT2FNq8bZlJIAIM278tPRJ3GEq2hRNUfnS0eUmJ+x3zs yaLnx0IDCvFgs2zSizMIRDWlaJBbNhDdxAiwx/6IKu9MVcw8gijiISGzYStHDySIHsRucm Lv2jMRfk4a4joYxrlPJBV6ZLgqFv8cwVk+QB6d+7YXuHLoyzPEAo7kAKg2xodbKlIAtVV3 WDpdEn9mqBz5q7+FGgfQtf5bQQOjAHCWHDCIxnFosDfR1mT225SrCbsi1DXRcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763093533; 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=PFkuvm4ASQLb76F5ypKtwqPztY0M/qizJnhi2Jt4bDM=; b=LS1GZxU4dM2MGHebve9hD1h/wQBzoGfLWKuieciPxtEW/PkKVHZ8pfSLFWyLB5mLsC4i+S ugsAWao3j3RjXYjfuurqZhu0FggRSOax/xi3dL1NJwFHRHiziIFnfpE0t0hw+Kot8mymc/ h5+lFKZ+L+R2L8Tj/5M5pRTJ9SWS5RkHlD1uCL749iiJSAsU8Ce5qoFB1IuwVv7m/18CSU llWU/ZPLlWavdmMhz3VLWsVnxlchLuNqr91H5I2vogYkc0FJM3OlVESU6RQxgZNykWnabf o2FcD1Ym1ZG/+lwmcbE+QPAyf16FABfkz5f2TItleND16fq+DqQIg2H/aSImxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763093533; a=rsa-sha256; cv=none; b=fwyOz68rcapqEfS6Vcv1p3H7WU8Xzlejy14JhnSjQ1EpH2gZyDUvW7Hh6fxwwjzvkDOy8m HsxJov1Rtb2pLSZvCysK9BAQswWSi23YE6+rqgPqhIqjpdWc1l/eMha+I857GKg1pe/8Od dLP3nqXItM7DqPs3MSOv6I9OEw4BOumSoqo6OUm1p750Q+bnIX+mrdGj/Lu2s76Cq9PM7G X+BiPY+bGI6h58levh6kl/8v+zJ3UP2UPiwpyJc+qBij5CxwyVh/99sjKvyPT4liyMXkmR 4Yi4Hi298j5nbeD6vu4Co5e5camwBdjqrSB75ZuDEoZOefm4K1Zt5jNyBkXXDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d73cr6Xnbzrm2; Fri, 14 Nov 2025 04:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE4CCH0086296; Fri, 14 Nov 2025 04:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE4CCps086293; Fri, 14 Nov 2025 04:12:12 GMT (envelope-from git) Date: Fri, 14 Nov 2025 04:12:12 GMT Message-Id: <202511140412.5AE4CCps086293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: eb411cd796fe - stable/13 - ipfilter: Calculate the number of elements in ipf_errors 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb411cd796fecdff37a9728b158fdda8f545a785 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=eb411cd796fecdff37a9728b158fdda8f545a785 commit eb411cd796fecdff37a9728b158fdda8f545a785 Author: Cy Schubert AuthorDate: 2025-10-23 02:11:20 +0000 Commit: Cy Schubert CommitDate: 2025-11-12 04:02:31 +0000 ipfilter: Calculate the number of elements in ipf_errors It serves no purpose to manually manage the IPF_NUM_ERRORS count. Calculate it instead. Reviewed by: emaste, markj Differential revision: https://reviews.freebsd.org/D53308 (cherry picked from commit ab3c9853285b4907dac147ce2f818e3fb44df5a3) --- sbin/ipf/libipf/interror.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index 994fb9d2b320..c2a0fa269149 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -17,7 +17,7 @@ typedef struct { static ipf_error_entry_t *find_error(int); -#define IPF_NUM_ERRORS 477 +#define IPF_NUM_ERRORS sizeof(ipf_errors) / sizeof(ipf_error_entry_t) /* * NO REUSE OF NUMBERS! @@ -25,7 +25,7 @@ static ipf_error_entry_t *find_error(int); * IF YOU WANT TO ADD AN ERROR TO THIS TABLE, _ADD_ A NEW NUMBER. * DO _NOT_ USE AN EMPTY NUMBER OR FILL IN A GAP. */ -static ipf_error_entry_t ipf_errors[IPF_NUM_ERRORS] = { +static ipf_error_entry_t ipf_errors[] = { { 1, "auth table locked/full" }, { 2, "" }, { 3, "copyinptr received bad address" },