Re: [PATCH BlueZ 2/6] tools/btpclient: Move string to address conversion to helper

[Szymon Janc <szymon.janc@codecoup.pl>]

Hi Grzegorz,

On Thursday, 21 December 2017 17:47:16 CET Grzegorz Kolodziejczyk wrote:
> This patch makes local helper with string to address conversion.
> ---
>  tools/btpclient.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/btpclient.c b/tools/btpclient.c
> index 9ea624995..27e5a498e 100644
> --- a/tools/btpclient.c
> +++ b/tools/btpclient.c
> @@ -52,6 +52,12 @@ static struct btp *btp;
> 
>  static bool gap_service_registered;
> 
> +static inline uint8_t str2addr(const char *str, uint8_t *addr)

Just static, no need for inline in .c file.
Also make this return bool and verify sscanf return value in helper.

> +{
> +	return sscanf(str,"%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &addr[5], &addr[4],
> +					&addr[3], &addr[2], &addr[1], &addr[0]);
> +}
> +
>  static struct btp_adapter *find_adapter_by_proxy(struct l_dbus_proxy
> *proxy) {
>  	const struct l_queue_entry *entry;
> @@ -171,9 +177,7 @@ static void btp_gap_read_info(uint8_t index, const void
> *param, uint16_t length, if (!l_dbus_proxy_get_property(adapter->proxy,
> "Address", "s", &str)) goto failed;
> 
> -	if (sscanf(str,"%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> -			&rp.address[5], &rp.address[4], &rp.address[3],
> -			&rp.address[2], &rp.address[1], &rp.address[0]) != 6)
> +	if (str2addr(str, rp.address) != 6)
>  		goto failed;
> 
>  	if (!l_dbus_proxy_get_property(adapter->proxy, "Name", "s", &str)) {


-- 
pozdrawiam
Szymon Janc