From nobody Tue Jan 24 22:14:26 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 4P1h8f5bc1z3bgnG; Tue, 24 Jan 2023 22:14:26 +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 4P1h8f2ClDz3LYV; Tue, 24 Jan 2023 22:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598466; 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=hfUIi+GowCJpVxa2Kr+MNj7kGS+F/S6HGme5LH4lz+k=; b=YPO2SfGFeB1FJiqwV+F0EG0eETd6n78AmM2zCyIAjkS+fSiG5kcfp74Riv3fB7DquoAFwi f9/GnH1lNASMA+OyxruAv9d8MNjSJSUhjWjk8+amBms0OfqDqahl9f9Xi85QLWUS1hvcYk YcXbP5lmCDJTexRwl7y3fxkUqql50ydoD20uL85X8l6zI/q64Lf0v1+csND+Ck2VTOY06K oN2fxeVRqscyUq65m8RsRhFh9sCUdG4pkm0adgdoEsu9yNZaE1vm3DpplRaGIT1Ytk/cp7 /885auO9pxrhu6YajiTItWpOt4I2gFM1qb5dmRVsVNmmMbSUi2uGpcKCA4GoUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598466; 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=hfUIi+GowCJpVxa2Kr+MNj7kGS+F/S6HGme5LH4lz+k=; b=NeDO3Cgu7D3Zfton5GLYSC5bcUUjY/JuCkl9R1Ie9Ew/16/d7i9Df74ILU9qK4id31l4Iq 2pV7KZbZhHL/HT77rzMa8PA6qIFllhZ0wW7xpUqxdMBPT5NdorbnRqj+P/AE54SofBM0CL 9ysm7Svami9FvQEXhVIdSCiV358pjiyJK1MFHOkmmf3QbD1QLiq5WZNf05reFaXdJNSkiP RnyZsIs3lL4BePYNUAZb44SMoZJ5okjoB5y7lMI5+iktREmokxs73BeAkzdsCGgnIWpL3/ Czuqw7JaasVU7e1Z1aTwTygnVpfCoJoqobVkPDpxRLYgkZ2QjhQNhAZA2rRpMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598466; a=rsa-sha256; cv=none; b=xdbzm6WrqIj5b+zeKQuK9CyySLDNEyz2GWkMnE0cSEgzryJbtAEgUgyCgx/dJ6cV7oPhUk Xs1y11sY8rouI40X5hqUuWqAepxBw0ulu9z0fxfr47F2JEhKTZT+iiC4sjDbzt3A5AbqNR gNRRo+RV1Thq8W97fciFyGH3x/8NnUNmsCJnPDlegHt9121fInO6XrI5JPU2yeTqMV6/Jy ku0upJlFZq6aiAT2VdoxOvrOLzNM/gYfP9/i85Fh5NBRQwcHtjw6wFC16HMSFlmYlIIQ8S 32VTRSCfS/FDgSy1dRI1gyR+vPG0kFSpm1X57SXoLw4x8xdY2i+S234fpcFo+A== 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 4P1h8f1K9dzQhL; Tue, 24 Jan 2023 22:14:26 +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 30OMEQv2089815; Tue, 24 Jan 2023 22:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMEQHt089814; Tue, 24 Jan 2023 22:14:26 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:14:26 GMT Message-Id: <202301242214.30OMEQHt089814@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: 0cd6d49acf74 - stable/13 - stand/uboot: Explain why we test for NULL here 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: 0cd6d49acf74ab0746a1be91453515e4eedb2a14 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd6d49acf74ab0746a1be91453515e4eedb2a14 commit 0cd6d49acf74ab0746a1be91453515e4eedb2a14 Author: Warner Losh AuthorDate: 2023-01-13 21:19:47 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:46 +0000 stand/uboot: Explain why we test for NULL here Most parsedev routines assume that idev is non-null and can always be set. Since we break from this pattern in uboot, explain why in a comment. devparse was invented to put a lot of common code in one place and to simplify the archsw.arch_getdev code and any dv_parsedev code called. However, uboot couldn't use devparse at the time because its device naming scheme slightly different parsing. So, we still use uboot_parsedev directly from uboot_getdev where dev could be NULL. Add a comment to this effect. The match functionality added for ofw likely could be used to clean up the multiple kludges that are here for uboot's device naming differences with the normal boot loader. This work will wait for the future. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D38042 (cherry picked from commit 5740057b4388f116717b9614cd54cf2c755e6e7d) --- stand/uboot/devicename.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c index 075880baa59f..d5de86384369 100644 --- a/stand/uboot/devicename.c +++ b/stand/uboot/devicename.c @@ -148,6 +148,10 @@ uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, goto fail; } idev->dd.d_dev = dv; + /* + * dev can be NULL, since uboot_getdev calls us directly, rather than via + * dv_parsedev in devparse() which otherwise ensures that it can't be NULL. + */ if (dev == NULL) { free(idev); } else {