diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-01-29 17:58:28 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-01-29 17:58:28 +0100 |
commit | 9c0b5859e6cc4b7a0e925fde8665990281b265d3 (patch) | |
tree | 8994dbe0942d56c9a7cf470fc3b2316d1f91e0a3 /tools | |
parent | 1ce81e1e0794a5d619016e17b33b533b614fc6a9 (diff) |
Fix mostly every warning caused by -Wsign-compare
Diffstat (limited to 'tools')
-rw-r--r-- | tools/avctrl.c | 2 | ||||
-rw-r--r-- | tools/avinfo.c | 4 | ||||
-rw-r--r-- | tools/bccmd.c | 9 | ||||
-rw-r--r-- | tools/ciptool.c | 2 | ||||
-rw-r--r-- | tools/dfubabel.c | 2 | ||||
-rw-r--r-- | tools/dfutool.c | 15 | ||||
-rw-r--r-- | tools/hciattach_tialt.c | 2 | ||||
-rw-r--r-- | tools/hciconfig.c | 7 | ||||
-rw-r--r-- | tools/hcitool.c | 2 | ||||
-rw-r--r-- | tools/hid2hci.c | 9 | ||||
-rw-r--r-- | tools/sdptool.c | 11 |
11 files changed, 36 insertions, 29 deletions
diff --git a/tools/avctrl.c b/tools/avctrl.c index 463af945..7b5e685b 100644 --- a/tools/avctrl.c +++ b/tools/avctrl.c @@ -142,7 +142,7 @@ static int find_devices(struct device_info *devinfo, size_t size) struct usb_bus *bus; struct usb_device *dev; struct device_id *id; - int count = 0; + unsigned int count = 0; usb_find_busses(); usb_find_devices(); diff --git a/tools/avinfo.c b/tools/avinfo.c index 8f50cfd0..341c0af1 100644 --- a/tools/avinfo.c +++ b/tools/avinfo.c @@ -500,8 +500,8 @@ static int avdtp_get_caps(int sk, int seid) if (ret < 0) return ret; - if (ret < (sizeof(struct getcap_resp) + 4 + - sizeof(struct avdtp_media_codec_capability))) { + if (ret < ((int) sizeof(struct getcap_resp) + 4 + + (int) sizeof(struct avdtp_media_codec_capability))) { printf("Invalid capabilities\n"); return -1; } diff --git a/tools/bccmd.c b/tools/bccmd.c index 9d29cb0c..0e0c28c9 100644 --- a/tools/bccmd.c +++ b/tools/bccmd.c @@ -409,7 +409,8 @@ static int cmd_buildname(int transport, int argc, char *argv[]) { uint8_t array[130]; char name[64]; - int i, err; + unsigned int i; + int err; OPT_HELP(0, NULL); @@ -699,7 +700,7 @@ static int cmd_psget(int transport, int argc, char *argv[]) return err; length = array[2] + (array[3] << 8); - if (length + 6 > sizeof(array) / 2) + if (length + 6 > (int) sizeof(array) / 2) return -EIO; memset(array, 0, sizeof(array)); @@ -774,7 +775,7 @@ static int cmd_psset(int transport, int argc, char *argv[]) return err; length = array[2] + (array[3] << 8); - if (length + 6 > sizeof(array) / 2) + if (length + 6 > (int) sizeof(array) / 2) return -EIO; memset(array, 0, sizeof(array)); @@ -962,7 +963,7 @@ static int cmd_psread(int transport, int argc, char *argv[]) continue; length = array[2] + (array[3] << 8); - if (length + 6 > sizeof(array) / 2) + if (length + 6 > (int) sizeof(array) / 2) continue; memset(array, 0, sizeof(array)); diff --git a/tools/ciptool.c b/tools/ciptool.c index e8597f11..2afa30e8 100644 --- a/tools/ciptool.c +++ b/tools/ciptool.c @@ -203,7 +203,7 @@ static void cmd_show(int ctl, bdaddr_t *bdaddr, int argc, char **argv) struct cmtp_connlist_req req; struct cmtp_conninfo ci[16]; char addr[18]; - int i; + unsigned int i; req.cnum = 16; req.ci = ci; diff --git a/tools/dfubabel.c b/tools/dfubabel.c index 9778502e..498a717a 100644 --- a/tools/dfubabel.c +++ b/tools/dfubabel.c @@ -115,7 +115,7 @@ static int find_devices(struct device_info *devinfo, size_t size) struct usb_bus *bus; struct usb_device *dev; struct device_id *id; - int count = 0; + unsigned int count = 0; usb_find_busses(); usb_find_devices(); diff --git a/tools/dfutool.c b/tools/dfutool.c index 10387bbf..cab39feb 100644 --- a/tools/dfutool.c +++ b/tools/dfutool.c @@ -321,9 +321,10 @@ static void cmd_verify(char *device, int argc, char **argv) uint16_t bcd; char str[16]; unsigned char *buf; - unsigned long size; + size_t size; char *filename; - int i, fd, len; + unsigned int i, len; + int fd; if (argc < 2) { usage(); @@ -350,7 +351,7 @@ static void cmd_verify(char *device, int argc, char **argv) exit(1); } - if (read(fd, buf, size) < size) { + if (read(fd, buf, size) < (ssize_t) size) { perror("Can't load firmware"); free(buf); close(fd); @@ -419,10 +420,12 @@ static void cmd_upgrade(char *device, int argc, char **argv) struct dfu_suffix suffix; struct stat st; char *buf; - unsigned long filesize, count, timeout = 0; + size_t filesize; + unsigned long count, timeout = 0; char *filename; uint32_t crc, dwCRC; - int fd, i, block, len, size, sent = 0, try = 10; + unsigned int i; + int fd, block, len, size, sent = 0, try = 10; if (argc < 2) { usage(); @@ -449,7 +452,7 @@ static void cmd_upgrade(char *device, int argc, char **argv) exit(1); } - if (read(fd, buf, filesize) < filesize) { + if (read(fd, buf, filesize) < (ssize_t) filesize) { perror("Can't load firmware"); free(buf); close(fd); diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c index 8ddda359..aa63190a 100644 --- a/tools/hciattach_tialt.c +++ b/tools/hciattach_tialt.c @@ -142,7 +142,7 @@ static int texas_load_firmware(int fd, const char *firmware) { iov_cmd[1].iov_base = data; iov_cmd[1].iov_len = cmd->plen; nw = writev(fd, iov_cmd, 2); - FAILIF(nw != sizeof(cmd) + cmd->plen, + FAILIF(nw != (int) sizeof(cmd) + cmd->plen, "Could not send entire command (sent only %d bytes)!\n", nw); } diff --git a/tools/hciconfig.c b/tools/hciconfig.c index 46ca1693..960f450b 100644 --- a/tools/hciconfig.c +++ b/tools/hciconfig.c @@ -688,12 +688,13 @@ static void cmd_class(int ctl, int hdev, char *opt) printf("\tClass: 0x%02x%02x%02x\n", cls[2], cls[1], cls[0]); printf("\tService Classes: "); if (cls[2]) { + unsigned int i; int first = 1; - for (s = 0; s < (sizeof(services) / sizeof(*services)); s++) - if (cls[2] & (1 << s)) { + for (i = 0; i < (sizeof(services) / sizeof(*services)); i++) + if (cls[2] & (1 << i)) { if (!first) printf(", "); - printf("%s", services[s]); + printf("%s", services[i]); first = 0; } } else diff --git a/tools/hcitool.c b/tools/hcitool.c index f62f3161..73fbc839 100644 --- a/tools/hcitool.c +++ b/tools/hcitool.c @@ -1098,7 +1098,7 @@ static void cmd_cmd(int dev_id, int argc, char **argv) return; } - for (i = 2, len = 0; i < argc && len < sizeof(buf); i++, len++) + for (i = 2, len = 0; i < argc && len < (int) sizeof(buf); i++, len++) *ptr++ = (uint8_t) strtol(argv[i], NULL, 16); dd = hci_open_dev(dev_id); diff --git a/tools/hid2hci.c b/tools/hid2hci.c index 76b3766b..cd38aac7 100644 --- a/tools/hid2hci.c +++ b/tools/hid2hci.c @@ -129,7 +129,8 @@ static int send_report(int fd, const char *buf, size_t size) { struct hiddev_report_info rinfo; struct hiddev_usage_ref uref; - int i, err; + unsigned int i; + int err; for (i = 0; i < size; i++) { memset(&uref, 0, sizeof(uref)); @@ -179,8 +180,8 @@ static int switch_logitech(struct device_info *devinfo) memset(&dinfo, 0, sizeof(dinfo)); err = ioctl(fd, HIDIOCGDEVINFO, &dinfo); - if (err < 0 || dinfo.busnum != atoi(devinfo->dev->bus->dirname) || - dinfo.devnum != atoi(devinfo->dev->filename)) { + if (err < 0 || (int) dinfo.busnum != atoi(devinfo->dev->bus->dirname) || + (int) dinfo.devnum != atoi(devinfo->dev->filename)) { close(fd); continue; } @@ -288,7 +289,7 @@ static int find_devices(int mode, struct device_info *devinfo, size_t size) struct usb_bus *bus; struct usb_device *dev; struct device_id *id; - int count = 0; + unsigned int count = 0; usb_find_busses(); usb_find_devices(); diff --git a/tools/sdptool.c b/tools/sdptool.c index 39e193aa..4707f4cd 100644 --- a/tools/sdptool.c +++ b/tools/sdptool.c @@ -477,7 +477,7 @@ static void sdp_data_printf(sdp_data_t *sdpdata, struct attrib_context *context, case SDP_TEXT_STR8: case SDP_TEXT_STR16: case SDP_TEXT_STR32: - if (sdpdata->unitSize > strlen(sdpdata->val.str)) { + if (sdpdata->unitSize > (int) strlen(sdpdata->val.str)) { int i; printf("%.*sData :", indent, indent_spaces); for (i = 0; i < sdpdata->unitSize; i++) @@ -1754,7 +1754,7 @@ static int add_opush(sdp_session_t *session, svc_info_t *si) uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; //uint8_t formats[] = { 0xff }; void *dtds[sizeof(formats)], *values[sizeof(formats)]; - int i; + unsigned int i; uint8_t dtd = SDP_UINT8; sdp_data_t *sflist; int ret = 0; @@ -2164,7 +2164,7 @@ static int add_hid_keyb(sdp_session_t *session, svc_info_t *si) sdp_profile_desc_t profile[1]; sdp_list_t *aproto, *proto[3]; sdp_data_t *psm, *lang_lst, *lang_lst2, *hid_spec_lst, *hid_spec_lst2; - int i; + unsigned int i; uint8_t dtd = SDP_UINT16; uint8_t dtd2 = SDP_UINT8; uint8_t dtd_data = SDP_TEXT_STR8; @@ -2327,7 +2327,7 @@ static int add_hid_wiimote(sdp_session_t *session, svc_info_t *si) sdp_profile_desc_t profile[1]; sdp_list_t *aproto, *proto[3]; sdp_data_t *psm, *lang_lst, *lang_lst2, *hid_spec_lst, *hid_spec_lst2; - int i; + unsigned int i; uint8_t dtd = SDP_UINT16; uint8_t dtd2 = SDP_UINT8; uint8_t dtd_data = SDP_TEXT_STR8; @@ -3940,7 +3940,8 @@ static int cmd_records(int argc, char **argv) 0x4000000, 0x100000, 0x1000000, 0x4f491100, 0x4f491200 }; bdaddr_t bdaddr; - int i, n, opt, err = 0, num = 32; + unsigned int i, n, num = 32; + int opt, err = 0; /* Initialise context */ memset(&context, '\0', sizeof(struct search_context)); |