From nobody Wed Jan 29 21:57:18 2025 X-Original-To: dev-commits-src-main@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 4YjwxB6X2lz5m96T; Wed, 29 Jan 2025 21:57:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjwxB2YDfz3ZGP; Wed, 29 Jan 2025 21:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738187838; 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=yeG5KSfscoFr4720h/p4prt9GvP/NFyS86nqV6fdOzo=; b=R56vkjNZanjmQ0EglNzA+52XabJQHNDsb2hOMUtZTe1+lEnpciq3oXK2rHQYcgUCmPcclc 1VRMcoCOmQg2R77lLUIId+lfc1+Sye8k0hR/EXQ4D4o3tjEtXqMFGqtk6cO5PLWP34U+L+ ecpbLg8YzN7hff3HHCTdic/P47E4E/pKevrwptDNRvaP67EWlSQYaJ/XG+0uLzIWbvVYuc 7CTZcoZVocQMEE8iZ4JihXTBLC3jeb+l6UdKlGZZLuBIH/nbCO2gZJjBevKUk2hIqlpHnc fGubuPUXZrsZGFy19E7Dnau7/mMFrfCD9wV/Rger+OsKJUijB5VNLxIvPOmb3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738187838; 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=yeG5KSfscoFr4720h/p4prt9GvP/NFyS86nqV6fdOzo=; b=xheMonJdHrzMt4MFyWK8s3xSGrpBi7N5vj34tAR6TTZQm+52UouKBH42MmBH+J0FQRZqjt Oz9aDWcAYCC4GM2Fy7kQoX4Tn7uL0O5HX17OTdZAGIJC2XiVA6X54KJOOE6lhcFyg1XKFB RRdjyZDVmLbbkqVrO7pGuFQazTVp4sQJstlP2ykr7PuKvqe0JBniGa0B0RECHQevMfJlmp 0ah6YouWNRavXAjv1Lnw53jhUsnbI3+SpJy97wgLV0tQwMgjCxEvQASG4JjEmNglsG8Xcl jM/3zVk227rjJ7jMvvtzrx4po618m1S2yUFAeMhFH9bqhoZEvnRy43Av/Moq1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738187838; a=rsa-sha256; cv=none; b=bZknBAmmAfy07J9Tutr1Bcqe7DQHUFcLsfqUuUd9WOQHBAvS/AU6xRI1oO5fk3etTlImbW m9QMWQYuO/CLGrx03I+f6O+UpBtDe+weJsIssmp7ey5Pr9/rbb+LZIYp8EDcXwuwW96XS6 vr/fTmgsWy1vx6UxoltuE4kChMSEVB+9Xuewb1NTl+njRjfZFM8gIXMHKVj0/b3CGxTsTs Q9uv5a5WFZmUbuBSIR4trwW73cLq5RWsgTHGi0T4XA5tUjr0AKXuquwPHFuAXouSjzKNQ9 mRaIbnJuUXxaMUcXAJHOuRIUwkEyXlIfNyi47tubXWmkhnWBVCv7KJzHNzAEpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjwxB1tn8z4Kc; Wed, 29 Jan 2025 21:57:18 +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 50TLvI3F001412; Wed, 29 Jan 2025 21:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TLvI0W001409; Wed, 29 Jan 2025 21:57:18 GMT (envelope-from git) Date: Wed, 29 Jan 2025 21:57:18 GMT Message-Id: <202501292157.50TLvI0W001409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f466ba4ca479 - main - Refactor iwmbtfw: set default firmware_dir after argument parsing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f466ba4ca479ec500b927deadaba104469662994 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f466ba4ca479ec500b927deadaba104469662994 commit f466ba4ca479ec500b927deadaba104469662994 Author: Eygene Ryabinkin AuthorDate: 2025-01-29 21:56:40 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-01-29 21:56:40 +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 --- 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;