2018-09-07 23:25:44

by Stotland, Inga

Subject: [PATCH BlueZ] mesh: Add clean up on start up failure

Call bt_shell_clanup if failed to start the tool.
---
mesh/btmesh.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mesh/btmesh.c b/mesh/btmesh.c
index 108ec39f3..6a005a978 100644
--- a/mesh/btmesh.c
+++ b/mesh/btmesh.c
@@ -137,8 +137,8 @@ int main(int argc, char *argv[])
bt_shell_set_menu(&main_menu);

if (!index_option) {
- bt_shell_usage();
- return 0;
+ l_info("Controller index is required");
+ goto fail;
}

if (config_option)
@@ -156,8 +156,7 @@ int main(int argc, char *argv[])
mesh = mesh_new(index, config_option);
if (!mesh) {
l_info("Failed to create mesh\n");
- bt_shell_cleanup();
- return EXIT_FAILURE;
+ goto fail;
}

if (save_option)
@@ -172,6 +171,9 @@ int main(int argc, char *argv[])
mesh_unref(mesh);
mesh_cleanup();
l_main_exit();
-
return status;
+
+fail:
+ bt_shell_cleanup();
+ return EXIT_FAILURE;
}
--
2.17.1

2018-09-11 08:47:13

by Luiz Augusto von Dentz

Subject: Re: [PATCH BlueZ] mesh: Add clean up on start up failure

Hi Inga,

On Sat, Sep 8, 2018 at 2:25 AM, Inga Stotland <[email protected]> wrote:
> Call bt_shell_clanup if failed to start the tool.
> ---
> mesh/btmesh.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/mesh/btmesh.c b/mesh/btmesh.c
> index 108ec39f3..6a005a978 100644
> --- a/mesh/btmesh.c
> +++ b/mesh/btmesh.c
> @@ -137,8 +137,8 @@ int main(int argc, char *argv[])
> bt_shell_set_menu(&main_menu);
>
> if (!index_option) {
> - bt_shell_usage();
> - return 0;
> + l_info("Controller index is required");
> + goto fail;
> }
>
> if (config_option)
> @@ -156,8 +156,7 @@ int main(int argc, char *argv[])
> mesh = mesh_new(index, config_option);
> if (!mesh) {
> l_info("Failed to create mesh\n");
> - bt_shell_cleanup();
> - return EXIT_FAILURE;
> + goto fail;
> }
>
> if (save_option)
> @@ -172,6 +171,9 @@ int main(int argc, char *argv[])
> mesh_unref(mesh);
> mesh_cleanup();
> l_main_exit();
> -
> return status;
> +
> +fail:
> + bt_shell_cleanup();
> + return EXIT_FAILURE;
> }
> --
> 2.17.1

Applied, thanks.


--
Luiz Augusto von Dentz