Commit 673e1dd7 authored by Chen Gang's avatar Chen Gang Committed by Gustavo Padovan

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

For NULL 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: default avatarChen Gang <gang.chen@asianux.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 0a804654
...@@ -76,25 +76,19 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo ...@@ -76,25 +76,19 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
ci->flags = session->flags; ci->flags = session->flags;
ci->state = BT_CONNECTED; ci->state = BT_CONNECTED;
ci->vendor = 0x0000;
ci->product = 0x0000;
ci->version = 0x0000;
if (session->input) { if (session->input) {
ci->vendor = session->input->id.vendor; ci->vendor = session->input->id.vendor;
ci->product = session->input->id.product; ci->product = session->input->id.product;
ci->version = session->input->id.version; ci->version = session->input->id.version;
if (session->input->name) if (session->input->name)
strncpy(ci->name, session->input->name, 128); strlcpy(ci->name, session->input->name, 128);
else else
strncpy(ci->name, "HID Boot Device", 128); strlcpy(ci->name, "HID Boot Device", 128);
} } else if (session->hid) {
if (session->hid) {
ci->vendor = session->hid->vendor; ci->vendor = session->hid->vendor;
ci->product = session->hid->product; ci->product = session->hid->product;
ci->version = session->hid->version; ci->version = session->hid->version;
strncpy(ci->name, session->hid->name, 128); strlcpy(ci->name, session->hid->name, 128);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment