Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d2c865b1-bfbd-4667-2398-967b612f6c8d@molgen.mpg.de>
Date:   Fri, 18 Feb 2022 07:28:43 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.0
Subject: Re: [PATCH BlueZ] main.conf: Fix parsing of mode options
Content-Language: en-US
To:     Luiz Augusto von Dentz <luiz.dentz@gmail.com>
References: <20220218021605.3126182-1-luiz.dentz@gmail.com>
Cc:     linux-bluetooth@vger.kernel.org
From:   Paul Menzel <pmenzel@molgen.mpg.de>
In-Reply-To: <20220218021605.3126182-1-luiz.dentz@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

Dear Luiz,


Am 18.02.22 um 03:16 schrieb Luiz Augusto von Dentz:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This replace the of g_key_file_get_integer which is limited to only

Do you mean “This replaces the use of”? Maybe just:

Replace g_key_file_get_integer, limited to only decimal values, with …

> decimal values to g_key_file_get_string and then use strtol to convert
> the string value to integer.

Maybe give an example config file line with a hex assignment:

     X=0x…
> Fixes: https://github.com/bluez/bluez/issues/293
> ---
>   src/main.c | 15 ++++++++++++---
>   1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/src/main.c b/src/main.c
> index bf9d398e4..a448320c1 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -354,13 +354,22 @@ static void parse_mode_config(GKeyFile *config, const char *group,
>   
>   	for (i = 0; i < params_len; ++i) {
>   		GError *err = NULL;
> -		int val = g_key_file_get_integer(config, group,
> -						params[i].val_name, &err);
> +		char *str;
> +
> +		str = g_key_file_get_string(config, group, params[i].val_name,
> +									&err);
>   		if (err) {
>   			DBG("%s", err->message);
>   			g_clear_error(&err);
>   		} else {
> -			info("%s=%d", params[i].val_name, val);
> +			char *endptr = NULL;
> +			int val;
> +
> +			val = strtol(str, &endptr, 0);
> +			if (!endptr || *endptr != '\0')
> +				continue;
> +
> +			info("%s=%s(%d)", params[i].val_name, str, val);
>   
>   			val = MAX(val, params[i].min);
>   			val = MIN(val, params[i].max);


Kind regards,

Paul