From nobody Thu Feb 27 16:55:56 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 4Z3ct51Dvfz5qNVr; Thu, 27 Feb 2025 16:55:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3ct50kjwz45wr; Thu, 27 Feb 2025 16:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740675357; 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=LWz1+WbUl+G2TatniDv2WIMyxZi9EBq+FErIP/4JwSs=; b=XlgaOQoSeC7Kptu3xgONoqik0vXUQ780ExEAHloxjH5PCKPrePdIWsmn/xDoL4PyS6/AxV fHGSyJFAHoLgcseQlxtkKmzyWbyv9bgwlot5PYMo0mYxML5LZUCxhWZ68A8seVtgRCmYeS pINubkhLbvg1EzYLy+z3i9H/Ovdvid9bt4o7sOpAN6w/gDby6xrMeCVzbNdCkH5NBmZROh VAFeIY6LFxDXH8BS83Yu/BisbTeA3EzlsLyrcwV0YXGikfcAYpD8yTmZbdbvc6xehk5+iY +B/Wb2rphSMeQ8MO8hKnxT7Ml+bUA9zFcqptAX7g+8FTq2mMc2L6v3G2UARZEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740675357; a=rsa-sha256; cv=none; b=Fr3oTqaSAOPaOkAzD4ebxtluYRO8351E0ANLRu8DlUobHCgn+9qlT+m8dIfoNbFGGSgD1V LfAbA1P544m0hb4O1l2Vbz9L2UbDCs5iKLOQZM/XFKhWao5FvWUxEjXcJY+RkBHT9+CPoW ucg1Yz05BAnvmT9H9yQXsBp8J2WollJY0LUKoYhUiwF96rBK4PZbW+kxWewC10QfbumDQ+ /4Z82zytFyU1WryBlxifjDrOmMtrijsQRKJ2I+eCnPunRwNZWf2yEUDJW7RNLuOv/Runw9 ni/iTlWEN3iqeKu7oXSC1NF+nFg51SaoW5SNUk6M5GNGAsQD9FVIR+NsWP/EvQ== 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=1740675357; 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=LWz1+WbUl+G2TatniDv2WIMyxZi9EBq+FErIP/4JwSs=; b=bdhb3GxbwHSxOgxi4wNGiIRtk3Omf2O/TJn2BPkrZ+ypCrGJRPuDpxkeBH/ah8ubzPBMoU BpThZxzc9voYwusaogEYqu0ymR/D72UWhrgEYK0rDGbW615NsiWWi+XUy9SOA9+VWk0cYp gY7e5MVC7AHKLTFc0mt2qIv0iQcJUXoSoRcrzZ6UyTYKrRZW+lyel0KLyHjFsYfA8xrZC2 IesWVNfGOE/O7Q7whZ+Ru0nBPQIevtJrv0CtHYh8hVbFup1vsPvrg/XuCLlQqOa9Gy1AhH axKWYn5qK2h7mBQ0VmrVtu+FaQgKmO3uMoaDfS8sJ+omYtpz5WGcHpCRuBqa2A== 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 4Z3ct50Fm3zrtt; Thu, 27 Feb 2025 16:55:57 +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 51RGtuwe017097; Thu, 27 Feb 2025 16:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RGtuxh017094; Thu, 27 Feb 2025 16:55:56 GMT (envelope-from git) Date: Thu, 27 Feb 2025 16:55:56 GMT Message-Id: <202502271655.51RGtuxh017094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b67839d769dd - stable/14 - stand/kshim: Replace devclass_equal with calls to strcmp 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b67839d769dd01c854ef4d4b2a5474985d26f3b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b67839d769dd01c854ef4d4b2a5474985d26f3b2 commit b67839d769dd01c854ef4d4b2a5474985d26f3b2 Author: John Baldwin AuthorDate: 2025-01-11 04:03:02 +0000 Commit: John Baldwin CommitDate: 2025-02-27 15:25:39 +0000 stand/kshim: Replace devclass_equal with calls to strcmp Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D48412 (cherry picked from commit 40d7ba08773751ff7d0df1a3f112b32d1d04e5ec) --- stand/kshim/bsd_kernel.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c index abe81ccc6c1d..1e3b5d245ca7 100644 --- a/stand/kshim/bsd_kernel.c +++ b/stand/kshim/bsd_kernel.c @@ -559,27 +559,6 @@ static TAILQ_HEAD(, module_data) module_head = static TAILQ_HEAD(, devclass) devclasses = TAILQ_HEAD_INITIALIZER(devclasses); -static uint8_t -devclass_equal(const char *a, const char *b) -{ - char ta, tb; - - if (a == b) - return (1); - - while (1) { - ta = *a; - tb = *b; - if (ta != tb) - return (0); - if (ta == 0) - break; - a++; - b++; - } - return (1); -} - int bus_generic_resume(device_t dev) { @@ -897,7 +876,7 @@ device_get_method(device_t dev, const char *what) mtod = dev->dev_module->driver->methods; while (mtod->func != NULL) { - if (devclass_equal(mtod->desc, what)) { + if (strcmp(mtod->desc, what) == 0) { return (mtod->func); } mtod++; @@ -950,7 +929,7 @@ device_probe_and_attach(device_t dev) bus_name_parent = device_get_name(device_get_parent(dev)); TAILQ_FOREACH(mod, &module_head, entry) { - if (!devclass_equal(mod->bus_name, bus_name_parent)) + if (strcmp(mod->bus_name, bus_name_parent) != 0) continue; dc = devclass_find(mod->mod_name); @@ -1083,7 +1062,7 @@ devclass_find(const char *classname) devclass_t dc; TAILQ_FOREACH(dc, &devclasses, link) { - if (devclass_equal(dc->name, classname)) + if (strcmp(dc->name, classname) == 0) return (dc); } return (NULL);