From nobody Sat Mar 01 09:39:38 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 4Z4g5k3Rnyz5p7Tx; Sat, 01 Mar 2025 09:39:38 +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 4Z4g5k1k2Sz3HN1; Sat, 01 Mar 2025 09:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740821978; 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=HKgXF6oGzTb8vm4OQ9YPJ2WgNRYwKNiZCclW2AnDuyU=; b=Y2IkZMFVmlubTwDw8XQES3YVhG8xSQ259EGbZW1d4lz3yW+5W1Bd7UP3Pw5y3vXihxeSJI otq+IeSsGczepcS1/NQ9cv9LQ/htBQO+0+5OcgcUT9ZyoIAsQjlUvJ0BkETYRuZ3wC1nDG Or9vYt1EPtJiPa9p9N66su52LHwVudFnlR50KQHKBp69fGbs57J25WTIA8LyflRsGkFw0q gY1Ek9Gzfbvp9qVunsyPeYZd3WpIfsrqJG7fBmqTeVOT9GT1TSbsMq1/3a+vb2eopa2N6o NJcXgdsB1ndhfoH/VKiOQLLYKu9P//JDZTYLaebgB2X0bl+orw6GCNOZClzyUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740821978; a=rsa-sha256; cv=none; b=idUSXC1QIfuWmFEE09r2GUiu2g+/kQdF6xComKptArWcS6FJ7RCj25oF9WaQiKKPK/Uyma w1w1P+HdjxcG3doqA4p3qPwfX0SiiXJF5jE+bs5HQoTV0J9ivqppL7DWcgYBaryJHZvOQ/ SB15y6jtFMBVOBkLSz3l8ZCwN8Eb4OZ0OaJ4ziimDyBBbHb70sozw38lX+MJlcGVgmWeFX T4fNJgMR1iGIwqLNKD2MPWrD3TmOMuTfTQUtTFvOEccHcSagO8ttQc9mhpqI6NT4ylHomd V5DwCCPKD+NjHRxW8RA8uxvmiAl0azU39YJcZfylUQLHI2htlWwVMhoJQVO16Q== 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=1740821978; 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=HKgXF6oGzTb8vm4OQ9YPJ2WgNRYwKNiZCclW2AnDuyU=; b=pmIDAOUeiNyLzrYfrr3buFjZ3+5frxm8WBSBhOsd4t1heQnQ2WOmO1tTDB04cljIyf+ny5 lgHYmXGHBsOMxcjRYnbtCS4yKfb9PZevQ4AoRPz8ssWYq16NAkQNQVU/1xGFwZt9uqOOlR pwGVMZY39y7oXKVqR0x5yDjSvQ85n67kheOI+bRPiKLwC4keYLU+GBtWfCJfrVDYK3EPms k1r3unm0VLjdavX6cPQ7+VvVz9rtrF4A4PVKkMmoF/4s/8RaTt2wWhbVEPr7miX2Yu2QRQ vwguPDxl05C/OjeJx6ohKyvab0DnsXPJXZUgi4vi1nyiUab0gnZ9xCIEGr7w7w== 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 4Z4g5k1KWkz18P8; Sat, 01 Mar 2025 09:39:38 +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 5219dcCn084552; Sat, 1 Mar 2025 09:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5219dcN9084549; Sat, 1 Mar 2025 09:39:38 GMT (envelope-from git) Date: Sat, 1 Mar 2025 09:39:38 GMT Message-Id: <202503010939.5219dcN9084549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d3f637b744e2 - stable/14 - Refactor iwmbtfw: set default firmware_dir after argument parsing 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3f637b744e20f11ebfa3ea6d08cd2923325838a Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f637b744e20f11ebfa3ea6d08cd2923325838a commit d3f637b744e20f11ebfa3ea6d08cd2923325838a Author: Eygene Ryabinkin AuthorDate: 2025-01-29 21:56:40 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-01 09:36:01 +0000 Refactor iwmbtfw: set default firmware_dir after argument parsing Don't repeat firmware_dir stanza at all "if" branches: be more DRY. Signed-off-by: Eygene Ryabinkin Reviewed by: wulf MFC after: 1 month (cherry picked from commit f466ba4ca479ec500b927deadaba104469662994) --- usr.sbin/bluetooth/iwmbtfw/main.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/usr.sbin/bluetooth/iwmbtfw/main.c b/usr.sbin/bluetooth/iwmbtfw/main.c index 9c899d374e92..e4bb22af0e8a 100644 --- a/usr.sbin/bluetooth/iwmbtfw/main.c +++ b/usr.sbin/bluetooth/iwmbtfw/main.c @@ -451,6 +451,10 @@ main(int argc, char *argv[]) /* NOTREACHED */ } + /* Default the firmware path */ + if (firmware_dir == NULL) + firmware_dir = strdup(_DEFAULT_IWMBT_FIRMWARE_PATH); + /* libusb setup */ r = libusb_init(&ctx); if (r != 0) { @@ -508,10 +512,6 @@ main(int argc, char *argv[]) goto reset; } - /* Default the firmware path */ - if (firmware_dir == NULL) - firmware_dir = strdup(_DEFAULT_IWMBT_FIRMWARE_PATH); - firmware_path = iwmbt_get_fwname(&ver, ¶ms, firmware_dir, "bseq"); if (firmware_path == NULL) goto shutdown; @@ -603,10 +603,6 @@ main(int argc, char *argv[]) goto shutdown; } - /* Default the firmware path */ - if (firmware_dir == NULL) - firmware_dir = strdup(_DEFAULT_IWMBT_FIRMWARE_PATH); - firmware_path = iwmbt_get_fwname(&ver, ¶ms, firmware_dir, "sfi"); if (firmware_path == NULL) goto shutdown; @@ -689,10 +685,6 @@ main(int argc, char *argv[]) goto shutdown; } - /* Default the firmware path */ - if (firmware_dir == NULL) - firmware_dir = strdup(_DEFAULT_IWMBT_FIRMWARE_PATH); - firmware_path = iwmbt_get_fwname_tlv(&ver_tlv, firmware_dir, "sfi"); if (firmware_path == NULL) goto shutdown;