From nobody Thu Jan 23 11:21:33 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 4Ydz6P4bHBz5knHW; Thu, 23 Jan 2025 11:21:33 +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 4Ydz6P40t2z481j; Thu, 23 Jan 2025 11:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737631293; 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=BTmv3ZalWqRNFIM0q6qxaCQni8+yGDt4G2B95jbIkNA=; b=PZUaH3P24Pa7d6pwyhtbFbiIklZ9F7KkxHaPxsHEZOeaz4cIyFvu4JTJb6ImieCNfTJGdz 5F2UcB+i4XOmRIKyWVyw21/m+CUqul6Z9linzLvX8yIUitajRTZ9XQsyBABBhTa1GlRf5O qHvQQkUUta6RR/wMB+SxzQAquWBbNcP5MnztFr+AToi68Nn458E0cv4VGLW4SSep1W2WYc EKFBtu0+/f0uwUGUQyQdrSqFLTUOtdMNGIGXoAbE+PAdmO6FT9DYnrYaH+Q4MDEkDgss63 cq4ktJzpGHFNOWtVYM+Be/unJVWvWdnlr1CR2tehkfwukOgFzfA1NZmwbz6NkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737631293; 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=BTmv3ZalWqRNFIM0q6qxaCQni8+yGDt4G2B95jbIkNA=; b=JLUAnpKsTGiXgfp4vS9l+dx3+kWOrrZpeK8tR/QhpQqSA14VA+LMV+vJL/uSm7tbL2g61v g42KslE8foWvViGMZ5SoJbzTszyETeskWQKynu3lED/fm9d1ie2twq2v7KT3s+Imqo62vT twTRXn4Fr04r3hcspBE4vnk6ZabtM00d9jkT7XaZt6qxePpxoObCclvGdYrVCzOPtnVNtP 6nTVQ9SO5ysqUWIkAe9NsN8jT2owksf3/IrTKnkd66ab5wdZCJota23pi0dJEsoyLXU6Lw Fg8QD99Pw4vq/bgaVyAG5rt6ibuZacEy3khEdxPSSzqpV2yFmpFOZrCeVHYYGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737631293; a=rsa-sha256; cv=none; b=RMOY+Py3zlZV7gFqjdkZLN5cTgnhL+i+Twb8TmWKdKVaNDcGwjl/wdqSovNcH083D2IZIw i+siMaEs+cKJI5N7QA2Rca6asafF7ni7RVSzNOweoJWrI3WX/WB9M0FDJ5LTs+a6Tg62YX ORQ2Sg2qKRJzzSqeUMg7AwJBlRyrINEb0EqFYFLQjMcxbRPXBC2f2gN/9SaVxlQ56Beg9b MCeLSk3QL4SRXs/RJ1MXpGNn5VAmqUWTxswzQnhSayu+FBuvdE/xtWfgBKxalbgVVkYsXP 6U5vopIitpI83RXn9QF/mhCcAkk8Sk3ChQt76d2i/j2ejrxAM0MhzHBmxqUEkQ== 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 4Ydz6P3bDBzd5q; Thu, 23 Jan 2025 11:21:33 +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 50NBLXtb038098; Thu, 23 Jan 2025 11:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NBLXEI038095; Thu, 23 Jan 2025 11:21:33 GMT (envelope-from git) Date: Thu, 23 Jan 2025 11:21:33 GMT Message-Id: <202501231121.50NBLXEI038095@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: c44335b1a313 - stable/13 - name2oid: use find_oidname 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: c44335b1a3137628f1b5c657c11aff1a95329085 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c44335b1a3137628f1b5c657c11aff1a95329085 commit c44335b1a3137628f1b5c657c11aff1a95329085 Author: Doug Moore AuthorDate: 2022-09-27 21:17:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-23 11:09:18 +0000 name2oid: use find_oidname In name2oid, use sysctl _find_oidname instead of re-implementing it. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36765 (cherry picked from commit 9f6f9007b98fc407a1b064c4492697e27954191a) --- sys/kern/kern_sysctl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 2543c4bde785..aa9d271f3bd2 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1323,17 +1323,11 @@ name2oid(char *name, int *oid, int *len, struct sysctl_oid **oidpp) { struct sysctl_oid *oidp; struct sysctl_oid_list *lsp = &sysctl__children; - char *p; SYSCTL_ASSERT_LOCKED(); for (*len = 0; *len < CTL_MAXNAME;) { - p = strsep(&name, "."); - - SYSCTL_FOREACH(oidp, lsp) { - if (strcmp(p, oidp->oid_name) == 0) - break; - } + oidp = sysctl_find_oidname(strsep(&name, "."), lsp); if (oidp == NULL) return (ENOENT); *oid++ = oidp->oid_number;