From nobody Tue Jan 28 15:23:14 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 4Yj8Dz0TPZz5lcT7; Tue, 28 Jan 2025 15:23:15 +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 4Yj8Dy50y9z3jVp; Tue, 28 Jan 2025 15:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077794; 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=o7qz6YxzdNvkJOxH/6yCj/3qX0wkFsW5O5LIxm9YyIE=; b=UizTrcSJrRoW+mhBRcklx/DpUllfzLtLy8irWDrOD0jLSf+2IdV31LY9chD/U/hjAhmMGl Kvr7352//JjEceUmSWt5tB+ueFN6IBajF+8kt6M29k6YvHK4ivf9j++uy3aW1+qTtiePM5 9PuURYhfI9rdhU8u4WFwzIxgfrefj7TPQmD4cBQNuf+r84DPVvph3o39Bg3ev4th5xmibw IABM6QQkZ/taG6OLlMIoPw4As8j3pQtHfjlmP0q6tKlX6uIDFL7rPwRBxkjiPsTDk1SFL1 6Zyj0zvYdi1lzTWJ/pOfXXxc3IGLiHjCj+hRHOCai2+Ux3Ba4JxJvtmEkqJLSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077794; 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=o7qz6YxzdNvkJOxH/6yCj/3qX0wkFsW5O5LIxm9YyIE=; b=DbLYfd4NG5ci4rSrsX33c5Xn+I8AzyHHmFqV+A4fkYo7NHRDN5rZdWH86uojgg/Ub8iCIP wJas8Qt8dQz2gLnTKvuWheVrOyUcbTGqXIbmAyD3xzImefqDAmhXzmfP++w2eyMMiRx0GM aSdO85zEGIetF0A9Sawa3kF6d7OdnyaVbkXOqaWAbkyiMzhzaD/GK2b8pi88zamKxz2Yxb dw+W2CPEg3aH87VXQVG9FZqYiQ5cPhytfljoKJcKBVSh0cvQZiXQlZFabsJU65I/udlZW7 ek10bGZ16/Sq6Oe4VIAKSO2qJAQMrRB91vFej+jr99d2JM2deehqUWzM42YkaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738077794; a=rsa-sha256; cv=none; b=pcf5Ybkqy9wWNDuxN1jlt7AhTfPgJXnLlSlDQzq8w2KYHgfwWWwxmm97I67y5g7B/nRNzm tC/coci1gmJ8lo4MRD6HUZon9p4bDMHKwSD7X+AXbwBSwFaHc9mA+kHVLRNI0bFD+4pksA g71bhZLOo2P0mraOLyJU96SOjFKY0MgtKguX5981EcIvvSPCu4ZPD7o4pipv33MsV0DTok YDkyVvJaVJmeHZ/RarsILTz0YiIxQStdjA2bEU7yez2LfNoeaFoYq+jav/I/BdHX13a9BV wMC8qFApG2BbpD5p0VpCjmUS/cmFjS/2TPO9xEdLG/muPvPLWhDvN+xXJp7kdw== 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 4Yj8Dy4SlHz5Tn; Tue, 28 Jan 2025 15:23:14 +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 50SFNELs070847; Tue, 28 Jan 2025 15:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFNEIb070844; Tue, 28 Jan 2025 15:23:14 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:23:14 GMT Message-Id: <202501281523.50SFNEIb070844@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: 719fb5a37731 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 719fb5a37731f6e69f2ba2b67fb3e19f2f007100 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=719fb5a37731f6e69f2ba2b67fb3e19f2f007100 commit 719fb5a37731f6e69f2ba2b67fb3e19f2f007100 Author: Zhenlei Huang AuthorDate: 2025-01-25 17:59:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-28 15:22:15 +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) --- 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 9f340404f9b3..3d66de0b18bb 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -413,7 +413,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) {