From nobody Tue Jan 24 22:12:05 2023 X-Original-To: dev-commits-src-branches@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 4P1h5x6WHnz3bfrQ; Tue, 24 Jan 2023 22:12:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h5x4G9wz4QfC; Tue, 24 Jan 2023 22:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598325; 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=mZzMciRdQXJE7M1wgNFkzQUxIKr3Z1vu2qI2bdHB40E=; b=rlWlA6+d8P2l6x4V6odLV0aanNw1xtspFw9BvAslGRGz8/kiFj+sDe8/UDAvvd/FpNN20t BBphzE5E9aeyAgMCbkxR1V8EJfmVD43caigfP/fqw4nacbx61uaCCzQyBQWGvQDra4rwtA gafFBnYEYQDyLNrFtVxOx9L96xElSXpOu0LKkl6uBmx4No9O0M7zhyQDPU7vxifWMhDU4Y Mv7ynA86DB9kH5N3XPQYLqNBba+/6WL/Li4Fq1GMyuC4S2eyXYvNZ4Ip755EuArVzcCrrI H7aMt8tFAjJa1ZSvxGCW+pqJhY4zrjLwi+KUAwnSMuOyTTL990ioZfQ20gTjcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598325; 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=mZzMciRdQXJE7M1wgNFkzQUxIKr3Z1vu2qI2bdHB40E=; b=vKixnA55u9XZRmuWjCs6SA6UhhhNe6aKF9lKQStUaxN/+KafpC6BxfvA1xcVGVRiUpwMtR aKoiyd6qTEUisBV8Yo7iwWbr/7r7CjCPj2vnlvxKHUhorNepeogT/80Wxj8d9B/yKsy4a1 rE5EMUwDUNCBJasWJaJV80JZsQel5dSlulLUu22k4zBcP2nbmAc5VXoCiqUXO8S07szeQt 5EwqqaJzSJKh6ziwxGAXtW0egln5zHWtFr+7zFQcMkWabX991COlFwXFCNfWyBDOLdd+nC 2I8oYbLef65vkbnXm6TsL0GZy3EWtRBdpC/dqGJ1Hfieyo21EEL+gHqWaMAj9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598325; a=rsa-sha256; cv=none; b=jcYi6UIBONKaVI0xrGLn5wPppfqfO3uN2J6Wkb7/zmmJAKiugLFIL6evrWO1z+NiP9hxnc PN/BXlxxCIjzqi5KQ9U6rokKcwg0z1m88D//XIYtAGaGTU9S8Nhs/yA2nYkprojS/9dVz6 trTQBEyt1YM50oeee7KVW3GgkKWUgonybJr22YCJPIaV+nJ8bksGGmt9/kddakJCCFA9SJ 1pEKC84rrF8ZECCWjZWd3lN6TaZZX6i6vMojdnJ51HEJSA4wetrqoPw6X7oweP4wEdh//Z x3JZa6XfV1oJ7QUVzDDTKp3/6XaCM0XHUAEaLy1oFz7W2mltGceEKov2EkN7fw== 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 4P1h5x3N8RzQf5; Tue, 24 Jan 2023 22:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMC5OW086541; Tue, 24 Jan 2023 22:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC5Un086540; Tue, 24 Jan 2023 22:12:05 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:05 GMT Message-Id: <202301242212.30OMC5Un086540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 26e5e3ecbd61 - stable/13 - stand: uboot_fmtdev can be reduced to devformat List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26e5e3ecbd61d82b369a0ce6a83297e95526a691 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26e5e3ecbd61d82b369a0ce6a83297e95526a691 commit 26e5e3ecbd61d82b369a0ce6a83297e95526a691 Author: Warner Losh AuthorDate: 2022-08-11 15:08:52 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +0000 stand: uboot_fmtdev can be reduced to devformat devformat produces the same output as uboot_fmtdev, so just use it to reduce on the dependencies. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35926 (cherry picked from commit add8154e451f441778fb9c2fb7d10d281dea9611) --- stand/uboot/devicename.c | 23 ----------------------- stand/uboot/libuboot.h | 1 - stand/uboot/main.c | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c index b6b0e6e40639..b73a7694f14a 100644 --- a/stand/uboot/devicename.c +++ b/stand/uboot/devicename.c @@ -160,29 +160,6 @@ fail: } -char * -uboot_fmtdev(void *vdev) -{ - struct uboot_devdesc *dev = (struct uboot_devdesc *)vdev; - static char buf[128]; - - switch(dev->dd.d_dev->dv_type) { - case DEVT_NONE: - strcpy(buf, "(no device)"); - break; - - case DEVT_DISK: -#ifdef LOADER_DISK_SUPPORT - return (disk_fmtdev(vdev)); -#endif - - case DEVT_NET: - sprintf(buf, "%s%d:", dev->dd.d_dev->dv_name, dev->dd.d_unit); - break; - } - return(buf); -} - /* * Set currdev to suit the value being supplied in (value). */ diff --git a/stand/uboot/libuboot.h b/stand/uboot/libuboot.h index 18a12c216d7e..b9039bcf7fdf 100644 --- a/stand/uboot/libuboot.h +++ b/stand/uboot/libuboot.h @@ -50,7 +50,6 @@ struct uboot_devdesc { #endif int uboot_getdev(void **vdev, const char *devspec, const char **path); -char *uboot_fmtdev(void *vdev); int uboot_setcurrdev(struct env_var *ev, int flags, const void *value); extern int devs_no; diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 6648dc607c11..573995663fe4 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -533,7 +533,7 @@ main(int argc, char **argv) return (0xbadef1ce); } - ldev = uboot_fmtdev(&currdev); + ldev = devformat(&currdev.dd); env_setenv("currdev", EV_VOLATILE, ldev, uboot_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, ldev, env_noset, env_nounset); printf("Booting from %s\n", ldev);