From nobody Fri Jan 13 22:56:50 2023 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 4Ntxcf5KGMz2qxXF; Fri, 13 Jan 2023 22:56:50 +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 4Ntxcf4qGTz4Yxd; Fri, 13 Jan 2023 22:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673650610; 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=MT055VjNN8Lf2N7OpOp335FBu93nDGT3NGZE0u5vQJY=; b=WT/ghMl6ZcxPai/zNeef1bKb8uH9kjBWQn2x331wVL/hCwH/FXWoPqos94Va5CNuH9ZEV0 JeapWOikHOVF8m1QVEBN3XP9e4ILYKAFFmPCchtAltTQ2DShQ11Wnkakj/36gk0mA/3R8R nLw7fz1TTR2giLSpAD7AiuMZlyBTLiy8xvxIjXYbDdifEMiDHj0OVbsmwLo8ZZHuCW/Nxw JitG6/GTTxeOBQmmie4QXJ7sHmLY+OA+IEwUvB1lkyy+9HahOSiuD63dHWdfUJuTiXQGbI d8zqpfxALfegxGBBxhTD+aliPyVzE1seySKOjKhC3fh4UY8XnqkQMv++Cfx3uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673650610; 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=MT055VjNN8Lf2N7OpOp335FBu93nDGT3NGZE0u5vQJY=; b=o2LpY6RuYLQ+G3Lcrr/7dEhwtIV06WTp7Ya7wmakX4UciHlft5ouldtks7p8e4QH0SYB3D /dglTn+j+1C0xdthwxcYSMeVYEyVNpNuxlatXgnnSN8n5EGjwBo7ptzaivorzGQfpa3sm2 uUjMTrZ1vDj7p63mw4FD81CGxyWbY/NBZwDe2uUuyD609db1RgqF3o+FG+N8X0V1/21Az9 uD47hso8ssRPfKgr9plSv00GYt/ivS2DIu/ggW/boWzBZ8quRRqk6As4z5D1hioKqdGOEp O92yhieg8stCBnOxdk7yQ59Rf7DaFM0An+mQTI2s51C3IU9YQd6ty1LPzOC1TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673650610; a=rsa-sha256; cv=none; b=oGz4lLCcJJRItooJkjsUBdLwt5MYtiNG5IS3qEpK5nbb7eXubHTvzXrfFqlp73ivm+J4H/ 2TlEWAsk8Rh2DJdvPScsQbXD2j3Hs9qcmJcXvwHg8S4rZxPgB2g7+7fJ30KCTGTdFZuJqZ pYmAKP7OFrHN0Sb/zykHaKNuDi0j7sDyuleiRYaRpmWKphDaXMcjIYAurFmb/iS6hQm+wU CaShAXWjlr4xHw9D1QcLV34WPbJ9BQpp3u/WUdtnKVOrT940+fdYcchY6PtesNlZEWiHHt I953qN02ooeyBz2hiuMMKElg4cq7PzuNqGFxfG8SkfOiVTXDS/aFcVpxjtl1SQ== 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 4Ntxcf3mR0zQFV; Fri, 13 Jan 2023 22:56:50 +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 30DMuoo8070739; Fri, 13 Jan 2023 22:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DMuoGG070738; Fri, 13 Jan 2023 22:56:50 GMT (envelope-from git) Date: Fri, 13 Jan 2023 22:56:50 GMT Message-Id: <202301132256.30DMuoGG070738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4883f347f6ed - main - stand: dev can't be NULL in default_prasedev 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4883f347f6ed9a61f9789a3842077580250ebf44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4883f347f6ed9a61f9789a3842077580250ebf44 commit 4883f347f6ed9a61f9789a3842077580250ebf44 Author: Warner Losh AuthorDate: 2023-01-13 22:44:23 +0000 Commit: Warner Losh CommitDate: 2023-01-13 22:54:44 +0000 stand: dev can't be NULL in default_prasedev We pass in the address of a variable to store this value always in the only place that calls this function, so there is no need to test for NULL. Sponsored by: Netflix Notied by: tsoome in D38041 --- stand/libsa/dev.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c index 6d1834c8a14a..e76be6cd0eb0 100644 --- a/stand/libsa/dev.c +++ b/stand/libsa/dev.c @@ -100,10 +100,7 @@ default_parsedev(struct devdesc **dev, const char *devspec, idev->d_unit = unit; if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; - if (dev != NULL) /* maybe this can be required? */ - *dev = idev; - else - free(idev); + *dev = idev; return (0); fail: free(idev);