From nobody Mon Apr 28 17:07:35 2025 X-Original-To: dev-commits-src-main@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 4ZmVHr04QVz5tc7Y; Mon, 28 Apr 2025 17:07:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmVHq5CTxz3pw8; Mon, 28 Apr 2025 17:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745860055; 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=HyiAn2kLr9zR241C5KbQ3iTvA6gwWM4jteVO+rSqKN8=; b=tJK3/x5qQZMkpj31o2UPZq16eLKJ09v9OhxxwGIq5oxIX/EJICHj+/lF0aGgDl3q8X+5em 2YApwHrG828W+SXl4+yM2zm1PK4+4HuycQQFsMAgHXlLGe3MFHLMvSpxk+bLEA75NRp524 CNhzS8Zhjl2oEmUqIIyxmYXzrwxM5YeT7vqVwlLDrtLSCtxAfNDw1im5dEXoO0VpJhWa5M T0AUHrA5CKOfHdMCZNUBWC3iwmrvIG6xVSBDDo3z4rD1428XRlPilhTL7nuqH054ZUdeac Ho9nxEYyh350v9DLJGYNLkqA06CkWNWA2bgD/bh0JwuItLAf+Qhh50vXqw/e+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745860055; a=rsa-sha256; cv=none; b=qcIM/BCqU0J88UyuuSTuThSk39BiA2FQKCbPWw/BKd8dTb5PPf1GdjEV1rGn5i0el0Z/k7 e5txxaD/t+FIHveMgtgXYjUh/ACV4XqyaP34HhLUm+TbGeHH9y1hl5m++XHQVqGb1RuKz0 fWjd2EW1O3empjoAPViv/WfQlRnn3szBZo6DXa1D6bMopX120e82tsE1XBJas27dlKU0kq Bbuz1f1NOHqv4jcJ/OreMIo9tLVluoYKLtyz64XxKUjhNz+3xf8GosyJpGbccyjFdqrM2R LHfeaw3bMu+wYRF0YPkhKPiYv356qT/1FLUAo/GV9w2sW2CTY5VLfAIWUwFCIQ== 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=1745860055; 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=HyiAn2kLr9zR241C5KbQ3iTvA6gwWM4jteVO+rSqKN8=; b=QW3tOeimUg+CThTQ5TnRBF7nsI2DCdkT4EKkg0SG8UpqqpkjmaUSMYMfylFRohmmvxjsHf rpyh6jooly62nsU4sIgRXlfQx7TzSc/Xs261MX2nkGmOJ0URb0HJfsXw5HPQ0L5p867oTS xaiSiRu7FroT5InKKPpUqGCmGKG7FBT+49+mzpDnaPjw2ZvgHrB1d5S6qid971O6ba70Mi NlXv4os9XLpUTeKm7euqAPZBfE92O1m8PuurCgZsJCJbXcsJSSxphcVEEdspfLtdbH3F/Y VCGEfNTP3eaYi7ZOBfA5PC9WpfwenOC888EOzgTputtYaps1L/AnSA7qlgQEFA== 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 4ZmVHq4gPyzkNW; Mon, 28 Apr 2025 17:07:35 +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 53SH7ZxX052786; Mon, 28 Apr 2025 17:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SH7Z5C052783; Mon, 28 Apr 2025 17:07:35 GMT (envelope-from git) Date: Mon, 28 Apr 2025 17:07:35 GMT Message-Id: <202504281707.53SH7Z5C052783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dcb2a1ae46ad - main - : Conditionally export table of ID names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb2a1ae46ad4a5b810203abcbf5ddebbfc1741d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb2a1ae46ad4a5b810203abcbf5ddebbfc1741d commit dcb2a1ae46ad4a5b810203abcbf5ddebbfc1741d Author: John Baldwin AuthorDate: 2025-04-28 17:06:07 +0000 Commit: John Baldwin CommitDate: 2025-04-28 17:06:07 +0000 : Conditionally export table of ID names Only export the array of ID names if either _WANT_SFF_8024_ID or _WANT_SFF_8472_ID is defined. Exporting them unconditionally can trigger unused variable warnings if a consumer doesn't use the array. Reviewed by: olce, bz, brooks Differential Revision: https://reviews.freebsd.org/D49955 --- lib/libifconfig/libifconfig_sfp.c | 2 ++ sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c | 2 ++ sys/net/sff8472.h | 2 ++ usr.sbin/cxgbetool/cxgbetool.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/lib/libifconfig/libifconfig_sfp.c b/lib/libifconfig/libifconfig_sfp.c index 8292135d3e47..1ba6d231a992 100644 --- a/lib/libifconfig/libifconfig_sfp.c +++ b/lib/libifconfig/libifconfig_sfp.c @@ -24,6 +24,8 @@ * SUCH DAMAGE. */ +#define _WANT_SFF_8024_ID + #include #include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c index 182be547272a..9730ab3c56c1 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c @@ -26,6 +26,8 @@ #include "opt_rss.h" #include "opt_ratelimit.h" +#define _WANT_SFF_8024_ID + #include #include #include diff --git a/sys/net/sff8472.h b/sys/net/sff8472.h index a33dfed84b0b..33b6dddb5b9f 100644 --- a/sys/net/sff8472.h +++ b/sys/net/sff8472.h @@ -415,6 +415,7 @@ enum { SFF_8024_ID_LAST = SFF_8024_ID_QSFP_CMIS }; +#if defined(_WANT_SFF_8024_ID) || defined(_WANT_SFF_8472_ID) static const char *sff_8024_id[SFF_8024_ID_LAST + 1] = { "Unknown", "GBIC", @@ -448,6 +449,7 @@ static const char *sff_8024_id[SFF_8024_ID_LAST + 1] = { "x8MiniLink", "QSFP+(CIMS)" }; +#endif /* Keep compatibility with old definitions */ #define SFF_8472_ID_UNKNOWN SFF_8024_ID_UNKNOWN diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c index 8f58fe8107dc..c3bd883b39fc 100644 --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -25,6 +25,8 @@ * SUCH DAMAGE. */ +#define _WANT_SFF_8472_ID + #include #include #include