diff options
| author | emax <emax@FreeBSD.org> | 2006-09-21 17:16:37 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2006-09-21 17:16:37 +0000 |
| commit | e942f54609255e62fd09f4311b8ecf03002713a3 (patch) | |
| tree | da75bfa7d6545dfd31dcecf3e929b52d82aa3dc6 /usr.sbin/bluetooth | |
| parent | 582a76db5e779bf6f7d1bd577f554df37ecdf32d (diff) | |
| download | FreeBSD-src-e942f54609255e62fd09f4311b8ecf03002713a3.zip FreeBSD-src-e942f54609255e62fd09f4311b8ecf03002713a3.tar.gz | |
Pacify new GCC4 warnings.
Submitted by: kan
MFC after: 1 week
Diffstat (limited to 'usr.sbin/bluetooth')
| -rw-r--r-- | usr.sbin/bluetooth/bthidd/parser.y | 2 | ||||
| -rw-r--r-- | usr.sbin/bluetooth/hccontrol/link_control.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bluetooth/hcsecd/hcsecd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y index 8d95f4e..8f704a6 100644 --- a/usr.sbin/bluetooth/bthidd/parser.y +++ b/usr.sbin/bluetooth/bthidd/parser.y @@ -189,7 +189,7 @@ hid_descriptor: T_HID_DESCRIPTOR if (hid_device->desc != NULL) hid_dispose_report_desc(hid_device->desc); - hid_device->desc = hid_use_report_desc(buffer, hid_descriptor_size); + hid_device->desc = hid_use_report_desc((unsigned char *) buffer, hid_descriptor_size); if (hid_device->desc == NULL) { SYSLOG(LOGCRIT, "Could not use HID descriptor" EOL); YYABORT; diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c index 6123e44..ea880cd 100644 --- a/usr.sbin/bluetooth/hccontrol/link_control.c +++ b/usr.sbin/bluetooth/hccontrol/link_control.c @@ -42,7 +42,7 @@ static int hci_inquiry(int s, int argc, char **argv) { int n0, n1, n2, timo; - uint8_t b[512]; + char b[512]; ng_hci_inquiry_cp cp; ng_hci_event_pkt_t *e = (ng_hci_event_pkt_t *) b; diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c index d83e04b..de7a775 100644 --- a/usr.sbin/bluetooth/hcsecd/hcsecd.c +++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c @@ -282,8 +282,8 @@ send_pin_code_reply(int sock, struct sockaddr_hci *addr, cp = (ng_hci_pin_code_rep_cp *)(cmd + 1); memcpy(&cp->bdaddr, bdaddr, sizeof(cp->bdaddr)); - strncpy(cp->pin, pin, sizeof(cp->pin)); - cp->pin_size = strlen(cp->pin); + strncpy((char *) cp->pin, pin, sizeof(cp->pin)); + cp->pin_size = strlen((char const *) cp->pin); syslog(LOG_DEBUG, "Sending PIN_Code_Reply to '%s' " \ "for remote bdaddr %s", |
