Hi Chen
On Wed, May 8, 2013 at 5:34 AM, Chen Gang <gang.chen@xxxxxxxxxxx> wrote:
>
> For NUL terminated string, need always let it ended by zero.
>
> Since have already called memcpy() to initialize 'ci', so need not
> redundent initializations.
>
> Better use ''if(session->hid) {} else if(session->input) {}'' instead
> of ''if(session->hid) {}; if(session->input) {};''
Yep, looks good now.
Reviewed-by: David Herrmann <dh.herrmann@xxxxxxxxx>
Thanks
David
> Signed-off-by: Chen Gang <gang.chen@xxxxxxxxxxx>
> ---
> 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);
> }
> }
>
> --
> 1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
