2018-03-22 20:04:50

by Stotland, Inga

Subject: [PATCH BlueZ] shared/shell: Add bt_shell_cleanup

This releases resources used for shell initialization.
This is needed as a separate function to enable clean shutdown
when an application needs to exit prior to calling bt_shell_run(),
e.g., when failing program initialization based on processed command
line input options.
---
src/shared/shell.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/shared/shell.c b/src/shared/shell.c
index 10f26264f..33bc0d980 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -1001,11 +1001,16 @@ void bt_shell_run(void)

mainloop_run();

+ io_destroy(signal);
+
+ bt_shell_cleanup();
+}
+
+void bt_shell_cleanup(void)
+{
bt_shell_release_prompt("");
bt_shell_detach();

- io_destroy(signal);
-
if (data.envs) {
queue_destroy(data.envs, env_destroy);
data.envs = NULL;
--
2.13.6

2018-03-23 11:36:33

by Luiz Augusto von Dentz

Subject: Re: [PATCH BlueZ] shared/shell: Add bt_shell_cleanup

Hi Inga,

On Thu, Mar 22, 2018 at 10:04 PM, Inga Stotland <[email protected]> wrote:
> This releases resources used for shell initialization.
> This is needed as a separate function to enable clean shutdown
> when an application needs to exit prior to calling bt_shell_run(),
> e.g., when failing program initialization based on processed command
> line input options.
> ---
> src/shared/shell.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/shared/shell.c b/src/shared/shell.c
> index 10f26264f..33bc0d980 100644
> --- a/src/shared/shell.c
> +++ b/src/shared/shell.c
> @@ -1001,11 +1001,16 @@ void bt_shell_run(void)
>
> mainloop_run();
>
> + io_destroy(signal);
> +
> + bt_shell_cleanup();
> +}
> +
> +void bt_shell_cleanup(void)
> +{
> bt_shell_release_prompt("");
> bt_shell_detach();
>
> - io_destroy(signal);
> -
> if (data.envs) {
> queue_destroy(data.envs, env_destroy);
> data.envs = NULL;
> --
> 2.13.6

Applied, thanks.

--
Luiz Augusto von Dentz