* [PATCH] main: Make -d option repeatable
@ 2016-10-04 9:51 Slava Monich
2016-10-05 3:27 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: Slava Monich @ 2016-10-04 9:51 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
Concatenating the patterns makes more sense than using the last
supplied value and leaking the previous allocated patterns.
---
src/main.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index 46bb90b..b43bb4e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -137,10 +137,19 @@ static gboolean option_version = FALSE;
static gboolean parse_debug(const char *key, const char *value,
gpointer user_data, GError **error)
{
- if (value)
- option_debug = g_strdup(value);
- else
+ if (value) {
+ if (option_debug) {
+ char *prev = option_debug;
+
+ option_debug = g_strconcat(prev, ",", value, NULL);
+ g_free(prev);
+ } else {
+ option_debug = g_strdup(value);
+ }
+ } else {
+ g_free(option_debug);
option_debug = g_strdup("*");
+ }
return TRUE;
}
@@ -262,5 +271,7 @@ cleanup:
__ofono_log_cleanup();
+ g_free(option_debug);
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] main: Make -d option repeatable
2016-10-04 9:51 [PATCH] main: Make -d option repeatable Slava Monich
@ 2016-10-05 3:27 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2016-10-05 3:27 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]
On 10/04/2016 04:51 AM, Slava Monich wrote:
> Concatenating the patterns makes more sense than using the last
> supplied value and leaking the previous allocated patterns.
> ---
> src/main.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/src/main.c b/src/main.c
> index 46bb90b..b43bb4e 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -137,10 +137,19 @@ static gboolean option_version = FALSE;
> static gboolean parse_debug(const char *key, const char *value,
> gpointer user_data, GError **error)
> {
> - if (value)
> - option_debug = g_strdup(value);
> - else
> + if (value) {
> + if (option_debug) {
> + char *prev = option_debug;
> +
> + option_debug = g_strconcat(prev, ",", value, NULL);
> + g_free(prev);
> + } else {
> + option_debug = g_strdup(value);
> + }
> + } else {
> + g_free(option_debug);
> option_debug = g_strdup("*");
> + }
>
> return TRUE;
> }
> @@ -262,5 +271,7 @@ cleanup:
>
> __ofono_log_cleanup();
>
> + g_free(option_debug);
> +
> return 0;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-05 3:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-04 9:51 [PATCH] main: Make -d option repeatable Slava Monich
2016-10-05 3:27 ` Denis Kenzior
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.