[v3] Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code.

For NUL terminated string, need always let it ended by zero.

Since have already called memcpy() to initialize 'ci', so need not
redundant initialization.

Better use ''if(session->hid) {} else if(session->input) {}"" instead
of ''if(session->hid) {}; if(session->input) {};''

Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 net/bluetooth/hidp/core.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

Hello Maintainers:

Please help check this patch when you have time, thanks.

It is "Reviewed-by: David Herrmann <dh.herrmann@gmail.com>"

And also is "Acked-by: Jiri Kosina <jkosina@suse.cz>"

If need me do any additional things, please tell me.


Thanks.

On 05/13/2013 10:07 AM, Chen Gang wrote:
> 
> For NUL terminated string, need always let it ended by zero.
> 
> Since have already called memcpy() to initialize 'ci', so need not
> redundant initialization.
> 
> Better use ''if(session->hid) {} else if(session->input) {}"" instead
> of ''if(session->hid) {}; if(session->input) {};''
> 
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  net/bluetooth/hidp/core.c |   14 ++++----------
>  1 files changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
> index 940f5ac..f13a8da 100644
> --- a/net/bluetooth/hidp/core.c
> +++ b/net/bluetooth/hidp/core.c
> @@ -76,25 +76,19 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
>  	ci->flags = session->flags;
>  	ci->state = BT_CONNECTED;
>  
> -	ci->vendor  = 0x0000;
> -	ci->product = 0x0000;
> -	ci->version = 0x0000;
> -
>  	if (session->input) {
>  		ci->vendor  = session->input->id.vendor;
>  		ci->product = session->input->id.product;
>  		ci->version = session->input->id.version;
>  		if (session->input->name)
> -			strncpy(ci->name, session->input->name, 128);
> +			strlcpy(ci->name, session->input->name, 128);
>  		else
> -			strncpy(ci->name, "HID Boot Device", 128);
> -	}
> -
> -	if (session->hid) {
> +			strlcpy(ci->name, "HID Boot Device", 128);
> +	} else if (session->hid) {
>  		ci->vendor  = session->hid->vendor;
>  		ci->product = session->hid->product;
>  		ci->version = session->hid->version;
> -		strncpy(ci->name, session->hid->name, 128);
> +		strlcpy(ci->name, session->hid->name, 128);
>  	}
>  }
>  
>

Hi Chen,

* Chen Gang <gang.chen@asianux.com> [2013-05-13 10:07:11 +0800]:

> 
> For NUL terminated string, need always let it ended by zero.
> 
> Since have already called memcpy() to initialize 'ci', so need not
> redundant initialization.
> 
> Better use ''if(session->hid) {} else if(session->input) {}"" instead
> of ''if(session->hid) {}; if(session->input) {};''
> 
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  net/bluetooth/hidp/core.c |   14 ++++----------
>  1 files changed, 4 insertions(+), 10 deletions(-)

Sorry for the big delay on this, patches has now been applied to
bluetooth-next. Thanks all.

	Gustavo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On 05/21/2013 05:52 AM, Gustavo Padovan wrote:
> Hi Chen,
> 
> * Chen Gang <gang.chen@asianux.com> [2013-05-13 10:07:11 +0800]:
> 
>> > 
>> > For NUL terminated string, need always let it ended by zero.
>> > 
>> > Since have already called memcpy() to initialize 'ci', so need not
>> > redundant initialization.
>> > 
>> > Better use ''if(session->hid) {} else if(session->input) {}"" instead
>> > of ''if(session->hid) {}; if(session->input) {};''
>> > 
>> > Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> > ---
>> >  net/bluetooth/hidp/core.c |   14 ++++----------
>> >  1 files changed, 4 insertions(+), 10 deletions(-)
> Sorry for the big delay on this, patches has now been applied to
> bluetooth-next. Thanks all.

It doesn't matter, every member have their own work, especially, most of
us are busy.

Thank you for your work, too.


Thanks.