Date: Sat, 1 Mar 2025 09:39:38 GMT From: Vladimir Kondratyev <wulf@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d3f637b744e2 - stable/14 - Refactor iwmbtfw: set default firmware_dir after argument parsing Message-ID: <202503010939.5219dcN9084549@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f637b744e20f11ebfa3ea6d08cd2923325838a commit d3f637b744e20f11ebfa3ea6d08cd2923325838a Author: Eygene Ryabinkin <rea@FreeBSD.org> AuthorDate: 2025-01-29 21:56:40 +0000 Commit: Vladimir Kondratyev <wulf@FreeBSD.org> 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 <rea@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503010939.5219dcN9084549>