From nobody Tue Jan 28 15:27:38 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 4Yj8L24gvkz5lcgZ; Tue, 28 Jan 2025 15:27:38 +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 4Yj8L22S6nz3k5k; Tue, 28 Jan 2025 15:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738078058; 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=J02I9Ft2GRuOB04AUKghjUDsWhKeJkXa2Kgq/ZD3Aac=; b=Yh94KBD/pevwXqa1NxSTwDkiHPEZpMUX0zBYm1fAzGsPkrlyKUyJEkQxX7FmN9vTjfC5lp NkIRbuYjec3k2AfPgYz/mD1Yo7d/9w4uLuBSRiSPYwWgAp1LupZIQ5rsBtyHY/vgv7ZbRq w67PTRKrcfsqoogNNyEINUjy83nayNNRn27iEdqN4OJZvv0h7+R+4eXAXinOq2uxql0TkQ Q438StIva1w5h/X/3RtDaJcUJlQjajhbLKjBKZiRbT2InAAtk3BMdbgxoOsMqUmEVPvxpe 0YogDIZ1UZr4DadT3mhiNqLOYE0HKkZfbxplzEOgEh7fCdf6YjLEen3mXoC2JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738078058; 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=J02I9Ft2GRuOB04AUKghjUDsWhKeJkXa2Kgq/ZD3Aac=; b=mhCHmla3q2R64pWwVthTOigQvKP724SVQvSXZUSKS/1LH0UpWk53ib/69o8AJF1iPMArk2 smxseB1or87xQ+TNqoW/RGyfEq3hXPWnbwBmJEgI6Lo6qhSdpowhRbQV5vq3bbwOXCtIEG /LTnYPBrAQFTeVXX7lRARy0ITeA9Ttnsx9dHXjQc+pOfaSkV8DopWiw5bHDex9fpjhwZfJ o8bcEwQUPVXzagxKL45ReEm6rzxPeS7Mg057xIviAJ2OSsywsCe6xCBEcKZYW+OWnvsbJR 2qV71kcHBj0leMisF+shJsRBYejG5NqRCy5fcFAuUIipsWploNCk5TLhs6rthg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738078058; a=rsa-sha256; cv=none; b=OE3N47GWXdsQHLN2gHX6dVJVcxJ95PheTxe0bTGPUEQT7xPPxjWkxNICPHVYXhENNXQoa1 KQ5sgS08C5DlxVTa1yEvGc60YsZKMrnrzpAwZLuM9R29KKiQe2vLMYeap/rdCqk1ELG7YW 74jCBHAyht5YlNVRR7vZSIKQ1VrOGg4v6ie2FXoiwXZw2OBvcykisxAnBDDrkLsPrC+WLd YkVuRp1dPYk0G4poA9q8yVFjGzTnME4sjbZQp4QXW5XP67/YC70L/pIXuJ9WK21YGj5VZD gLJrTU5zTokPwGTPybWSVltnj4Fq+fkC8/Kci5kqLku5ig8JYB0Ch4X2wSwvEA== 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 4Yj8L21s1Vz59H; Tue, 28 Jan 2025 15:27:38 +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 50SFRcfj072251; Tue, 28 Jan 2025 15:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFRcxm072248; Tue, 28 Jan 2025 15:27:38 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:27:38 GMT Message-Id: <202501281527.50SFRcxm072248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 477403117f06 - stable/13 - kern_sysctl: Fix printing function name in the re-use sysctl leaf warning 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 477403117f06ce5b1de006925fc35d1fbec8dc76 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=477403117f06ce5b1de006925fc35d1fbec8dc76 commit 477403117f06ce5b1de006925fc35d1fbec8dc76 Author: Zhenlei Huang AuthorDate: 2025-01-25 17:59:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-28 15:26:49 +0000 kern_sysctl: Fix printing function name in the re-use sysctl leaf warning The helper function sysctl_warn_reuse() is intended to print the name of the caller rather than that of itself. PR: 221853 Fixes: 4ae2ade11426 Enhance debugibility of sysctl leaf re-use warnings MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48645 (cherry picked from commit faa845aab6113190ba8c75a171b2cca8673a6214) (cherry picked from commit 719fb5a37731f6e69f2ba2b67fb3e19f2f007100) --- sys/kern/kern_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index dd71b2880ae5..371d521d8850 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -403,7 +403,7 @@ sysctl_warn_reuse(const char *func, struct sysctl_oid *leaf) (void)sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_set_drain(&sb, sbuf_printf_drain, NULL); - sbuf_printf(&sb, "%s: can't re-use a leaf (", __func__); + sbuf_printf(&sb, "%s: can't re-use a leaf (", func); memset(nodes, 0, sizeof(nodes)); rc = sysctl_search_oid(nodes, leaf);