diff options
| author | plunky <plunky@NetBSD.org> | 2009-05-14 19:12:45 +0000 |
|---|---|---|
| committer | plunky <plunky@NetBSD.org> | 2009-05-14 19:12:45 +0000 |
| commit | 8ebedbbb875df9897951979cff3033060627aa4f (patch) | |
| tree | ac47dcb87011521d82c018e092aa40392807daad /lib/libbluetooth | |
| parent | 605d47cc62d21d6b6160e6b5cf8174ccf4f26f84 (diff) | |
fix some signed vs unsigned comparison issues
Diffstat (limited to 'lib/libbluetooth')
| -rw-r--r-- | lib/libbluetooth/sdp_compat.c | 8 | ||||
| -rw-r--r-- | lib/libbluetooth/sdp_put.c | 10 | ||||
| -rw-r--r-- | lib/libbluetooth/sdp_service.c | 12 | ||||
| -rw-r--r-- | lib/libbluetooth/sdp_session.c | 10 | ||||
| -rw-r--r-- | lib/libbluetooth/sdp_set.c | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/lib/libbluetooth/sdp_compat.c b/lib/libbluetooth/sdp_compat.c index a618086e013..abfcc7af1cf 100644 --- a/lib/libbluetooth/sdp_compat.c +++ b/lib/libbluetooth/sdp_compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */ +/* $NetBSD: sdp_compat.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -77,7 +77,7 @@ #define SDP_COMPAT #include <sys/cdefs.h> -__RCSID("$NetBSD: sdp_compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $"); +__RCSID("$NetBSD: sdp_compat.c,v 1.2 2009/05/14 19:12:45 plunky Exp $"); #include <errno.h> #include <sdp.h> @@ -170,7 +170,7 @@ sdp_search(void *xss, uint32_t plen, uint16_t const *pp, uint32_t alen, struct sdp_compat *sc = xss; sdp_data_t seq, ssp, ail, rsp, value; uint16_t attr; - int i; + size_t i; bool rv; if (sc == NULL) @@ -224,7 +224,7 @@ sdp_search(void *xss, uint32_t plen, uint16_t const *pp, uint32_t alen, while (vlen > 0 && sdp_get_attr(&seq, &attr, &value)) { vp->attr = attr; if (vp->value != NULL) { - if (value.end - value.next > vp->vlen) { + if (value.end - value.next > (ssize_t)vp->vlen) { vp->flags = SDP_ATTR_TRUNCATED; } else { vp->flags = SDP_ATTR_OK; diff --git a/lib/libbluetooth/sdp_put.c b/lib/libbluetooth/sdp_put.c index b6e5013b6d0..4133fd4924f 100644 --- a/lib/libbluetooth/sdp_put.c +++ b/lib/libbluetooth/sdp_put.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_put.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */ +/* $NetBSD: sdp_put.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sdp_put.c,v 1.1 2009/05/12 10:05:06 plunky Exp $"); +__RCSID("$NetBSD: sdp_put.c,v 1.2 2009/05/14 19:12:45 plunky Exp $"); #include <bluetooth.h> #include <limits.h> @@ -300,17 +300,17 @@ _sdp_put_ext(uint8_t type, sdp_data_t *data, ssize_t len) len -= 2; } - if (len > UINT32_MAX) + if ((size_t)len > UINT32_MAX) return false; - if (len > UINT16_MAX) { + if ((size_t)len > UINT16_MAX) { if (p + 5 + len > data->end) return false; p[0] = type | SDP_DATA_EXT32; be32enc(p + 1, (uint32_t)len); p += 5; - } else if (len > UINT8_MAX) { + } else if ((size_t)len > UINT8_MAX) { if (p + 3 + len > data->end) return false; diff --git a/lib/libbluetooth/sdp_service.c b/lib/libbluetooth/sdp_service.c index cd9ab1a9d6e..af71985f895 100644 --- a/lib/libbluetooth/sdp_service.c +++ b/lib/libbluetooth/sdp_service.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_service.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */ +/* $NetBSD: sdp_service.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sdp_service.c,v 1.1 2009/05/12 10:05:06 plunky Exp $"); +__RCSID("$NetBSD: sdp_service.c,v 1.2 2009/05/14 19:12:45 plunky Exp $"); #include <errno.h> #include <limits.h> @@ -236,7 +236,7 @@ sdp_service_attribute(struct sdp_session *ss, uint32_t id, /* * setup AttributeIDList */ - len = (ail == NULL ? sizeof(ail_default) : (ail->end - ail->next)); + len = (ail == NULL ? (ssize_t)sizeof(ail_default) : (ail->end - ail->next)); if (len < 0 || len > UINT16_MAX) { errno = EINVAL; return false; @@ -320,7 +320,7 @@ sdp_service_attribute(struct sdp_session *ss, uint32_t id, if (ss->cs[0] == 0) { rsp->next = rbuf; rsp->end = rbuf + rlen; - if (sdp_data_size(rsp) != rlen + if (sdp_data_size(rsp) != (ssize_t)rlen || !sdp_data_valid(rsp) || !sdp_get_seq(rsp, rsp)) break; @@ -372,7 +372,7 @@ sdp_service_search_attribute(struct sdp_session *ss, const sdp_data_t *ssp, /* * setup AttributeIDList */ - len = (ail == NULL ? sizeof(ail_default) : (ail->end - ail->next)); + len = (ail == NULL ? (ssize_t)sizeof(ail_default) : (ail->end - ail->next)); if (len < 0 || len > UINT16_MAX) { errno = EINVAL; return false; @@ -456,7 +456,7 @@ sdp_service_search_attribute(struct sdp_session *ss, const sdp_data_t *ssp, if (ss->cs[0] == 0) { rsp->next = rbuf; rsp->end = rbuf + rlen; - if (sdp_data_size(rsp) != rlen + if (sdp_data_size(rsp) != (ssize_t)rlen || !sdp_data_valid(rsp) || !sdp_get_seq(rsp, rsp)) break; diff --git a/lib/libbluetooth/sdp_session.c b/lib/libbluetooth/sdp_session.c index e7addcd4d3d..e5526ff7937 100644 --- a/lib/libbluetooth/sdp_session.c +++ b/lib/libbluetooth/sdp_session.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_session.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */ +/* $NetBSD: sdp_session.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sdp_session.c,v 1.1 2009/05/12 10:05:06 plunky Exp $"); +__RCSID("$NetBSD: sdp_session.c,v 1.2 2009/05/14 19:12:45 plunky Exp $"); #include <sys/socket.h> #include <sys/un.h> @@ -194,7 +194,7 @@ _sdp_send_pdu(struct sdp_session *ss, uint8_t pid, struct iovec *iov, int num) nw = writev(ss->s, iov, num); } while (nw == -1 && errno == EINTR); - if (nw != sizeof(pdu) + len) { + if ((size_t)nw != sizeof(pdu) + len) { errno = EIO; return false; } @@ -228,7 +228,7 @@ _sdp_recv_pdu(struct sdp_session *ss, uint8_t pid) if (nr == -1) return -1; - if (nr < sizeof(pdu)) { + if ((size_t)nr < sizeof(pdu)) { errno = EIO; return -1; } @@ -238,7 +238,7 @@ _sdp_recv_pdu(struct sdp_session *ss, uint8_t pid) if (pid != pdu.pid || ss->tid != pdu.tid - || nr != sizeof(pdu) + pdu.len) { + || (size_t)nr != sizeof(pdu) + pdu.len) { if (pdu.pid == SDP_PDU_ERROR_RESPONSE && pdu.len == sizeof(uint16_t)) errno = _sdp_errno(be16dec(ss->ibuf)); diff --git a/lib/libbluetooth/sdp_set.c b/lib/libbluetooth/sdp_set.c index 0f575b0eb19..0d7d557e3c9 100644 --- a/lib/libbluetooth/sdp_set.c +++ b/lib/libbluetooth/sdp_set.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_set.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */ +/* $NetBSD: sdp_set.c,v 1.2 2009/05/14 19:12:45 plunky Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sdp_set.c,v 1.1 2009/05/12 10:05:06 plunky Exp $"); +__RCSID("$NetBSD: sdp_set.c,v 1.2 2009/05/14 19:12:45 plunky Exp $"); #include <bluetooth.h> #include <limits.h> @@ -220,7 +220,7 @@ _sdp_set_ext(uint8_t type, const sdp_data_t *data, ssize_t len) } else if (p + 4 + len > data->end) return false; - if (len > UINT32_MAX) + if ((size_t)len > UINT32_MAX) return false; be32enc(p, (uint32_t)len); |
