From nobody Sat Jan 25 18:00:18 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 4YgMsb1FXYz5lh8x; Sat, 25 Jan 2025 18:00:19 +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 4YgMsZ6vNdz3FJn; Sat, 25 Jan 2025 18:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737828019; 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=BfMEyyPMgIMpLORkhr8Dq0J7QDApL8hRO1ZqZgbtJqQ=; b=sRfIwRpIxDLT4KWJlukWFQJyLKOrfDZksRq3wWs7ftgpAPlo8QZbwQIBCQ/sxCikbyQkxJ IkaU7h90JANX2Ft4juoCgo1uMBdkyxuWBmmvd7wNJ1dnthm5v/AXwjkhshWguPv1C39Wpa cKo7pHYL3kogOpeaeFTlKafwA7PM/riMXym3E7L2VOIcZOsDlAv1IRxdLGCuRMC4EG6z9J z3Pjh1FWJ+Vrv2gEV8e/5NXDr+CCfP6mBbV49vXSzN+wzSfYbg2sQVbbnaGCWoDs6LUWmW Fxj8Z9/P0dXCWS49cUSD6MsD+vijssraLEL2xxa1MTHCYxg2TpPEfTj/5bOLdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737828019; 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=BfMEyyPMgIMpLORkhr8Dq0J7QDApL8hRO1ZqZgbtJqQ=; b=F7isNVC5TWYuPvBiwJsNy4WyAUzCJG6yvHAjP3kfDeX/nsF8J88Snnm46mivx0nomElIOW NpHFZ1CaJcPe9xLMU9PMiU4zrFz9URA4eHDTUNBKZo4sraTku2mglYS5lbz/9KNRKVrG0U u8rMifcb5wyCwlBhMwBACG5tWRzTTGScLru66IWgT8YZKyYZkNdf83I4Up5ZcuE/dMSSCN Sd10zZXpGPlzYwXXcV+bY/DPV63dgWNXgADnRP4JVlD0NmvFKDvFeniuXiRyNdUvFm/W9O RK54/hN4AVhaqJRvJhPskcbUPa27PXfPV+MRvp0WwOxu0q7IZvgCPcMQg8jC6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737828019; a=rsa-sha256; cv=none; b=P7g+hLzK0sFQ1DZa9u+VjYe6GMat2cKVmKmwfvZX3l7amaRfn15c9bxucyxf5UhTAmcoJy +RmVWRiZdrmvVrYPWKgJNlAnxeBVBOZ5dE9FO4HAtnI+oWoOpJQkwro8QiIXiyMTFTANvT 74hW0q1cpEtUy65XGBl6AD0kFY2ruJLw74bRuphoubwwy+XfWnBrj8wvwNkqv/elIGXFLv Gpnw8hby+WJl4nUk+YFMcR/I7yASDlTfhHoaGcYaLNzdpKi9jacBYAvki08d8JaJpfKS2C VRdUgXdhJ04OMtDGNvqP+FxbZaTzNvUkBa+NlvZfesZAvJ8cI5cDxlLAqghgmw== 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 4YgMsZ6FX6z1LWJ; Sat, 25 Jan 2025 18:00:18 +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 50PI0I3l093056; Sat, 25 Jan 2025 18:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PI0IO2093053; Sat, 25 Jan 2025 18:00:18 GMT (envelope-from git) Date: Sat, 25 Jan 2025 18:00:18 GMT Message-Id: <202501251800.50PI0IO2093053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: faa845aab611 - main - kern_sysctl: Fix printing function name in the re-use sysctl leaf warning 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faa845aab6113190ba8c75a171b2cca8673a6214 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=faa845aab6113190ba8c75a171b2cca8673a6214 commit faa845aab6113190ba8c75a171b2cca8673a6214 Author: Zhenlei Huang AuthorDate: 2025-01-25 17:59:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-25 17:59:33 +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 --- 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 9d824fbd3cbd..da09aaed5558 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -411,7 +411,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); rc = sysctl_search_oid(nodes, leaf); if (rc > 0) {