From: Chen Gang <gang.chen@asianux.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Gustavo Padovan <gustavo@padovan.org>,
David Herrmann <dh.herrmann@gmail.com>,
Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
David Miller <davem@davemloft.net>,
andrei.emeltchenko@intel.com,
"linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>,
netdev <netdev@vger.kernel.org>
Subject: [PATCH v3] Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code.
Date: Mon, 13 May 2013 10:07:11 +0800 [thread overview]
Message-ID: <51904ACF.6010904@asianux.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1305091041140.23038@pobox.suse.cz>
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);
}
}
--
1.7.7.6
next prev parent reply other threads:[~2013-05-13 2:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 13:50 [PATCH] Bluetooth: hidp: using strlcpy or strcpy instead of strncpy Chen Gang
2013-05-07 13:50 ` Chen Gang
2013-05-07 14:08 ` [Suggestion] Bluetooth: hidp: redundant initialization or issue for function hidp_copy_session Chen Gang
2013-05-07 19:37 ` David Herrmann
2013-05-07 19:37 ` David Herrmann
2013-05-08 1:50 ` Chen Gang
2013-05-08 1:50 ` Chen Gang
2013-05-07 19:31 ` [PATCH] Bluetooth: hidp: using strlcpy or strcpy instead of strncpy David Herrmann
2013-05-08 1:02 ` Chen Gang
2013-05-08 1:02 ` Chen Gang
2013-05-08 3:34 ` [PATCH v2] Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code Chen Gang
2013-05-08 3:34 ` Chen Gang
2013-05-08 15:16 ` David Herrmann
2013-05-08 15:16 ` David Herrmann
2013-05-09 1:07 ` Chen Gang
2013-05-09 8:42 ` Jiri Kosina
2013-05-09 8:42 ` Jiri Kosina
2013-05-09 8:48 ` Chen Gang
2013-05-09 8:48 ` Chen Gang
2013-05-13 2:07 ` Chen Gang [this message]
2013-05-17 7:04 ` [PATCH v3] " Chen Gang
2013-05-20 21:52 ` Gustavo Padovan
2013-05-20 21:52 ` Gustavo Padovan
2013-05-21 1:40 ` Chen Gang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51904ACF.6010904@asianux.com \
--to=gang.chen@asianux.com \
--cc=andrei.emeltchenko@intel.com \
--cc=davem@davemloft.net \
--cc=dh.herrmann@gmail.com \
--cc=gustavo@padovan.org \
--cc=jkosina@suse.cz \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.