Module Name: src
Committed By: plunky
Date: Thu May 14 19:12:45 UTC 2009
Modified Files:
src/lib/libbluetooth: sdp_compat.c sdp_put.c sdp_service.c
sdp_session.c sdp_set.c
Log Message:
fix some signed vs unsigned comparison issues
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libbluetooth/sdp_compat.c \
src/lib/libbluetooth/sdp_put.c src/lib/libbluetooth/sdp_service.c \
src/lib/libbluetooth/sdp_session.c src/lib/libbluetooth/sdp_set.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libbluetooth/sdp_compat.c
diff -u src/lib/libbluetooth/sdp_compat.c:1.1 src/lib/libbluetooth/sdp_compat.c:1.2
--- src/lib/libbluetooth/sdp_compat.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_compat.c Thu May 14 19:12:45 2009
@@ -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 @@
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 @@
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;
Index: src/lib/libbluetooth/sdp_put.c
diff -u src/lib/libbluetooth/sdp_put.c:1.1 src/lib/libbluetooth/sdp_put.c:1.2
--- src/lib/libbluetooth/sdp_put.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_put.c Thu May 14 19:12:45 2009
@@ -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 @@
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;
Index: src/lib/libbluetooth/sdp_service.c
diff -u src/lib/libbluetooth/sdp_service.c:1.1 src/lib/libbluetooth/sdp_service.c:1.2
--- src/lib/libbluetooth/sdp_service.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_service.c Thu May 14 19:12:45 2009
@@ -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 @@
/*
* 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 @@
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 @@
/*
* 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 @@
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;
Index: src/lib/libbluetooth/sdp_session.c
diff -u src/lib/libbluetooth/sdp_session.c:1.1 src/lib/libbluetooth/sdp_session.c:1.2
--- src/lib/libbluetooth/sdp_session.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_session.c Thu May 14 19:12:45 2009
@@ -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 @@
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 @@
if (nr == -1)
return -1;
- if (nr < sizeof(pdu)) {
+ if ((size_t)nr < sizeof(pdu)) {
errno = EIO;
return -1;
}
@@ -238,7 +238,7 @@
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));
Index: src/lib/libbluetooth/sdp_set.c
diff -u src/lib/libbluetooth/sdp_set.c:1.1 src/lib/libbluetooth/sdp_set.c:1.2
--- src/lib/libbluetooth/sdp_set.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_set.c Thu May 14 19:12:45 2009
@@ -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 @@
} 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);
