Module Name: src
Committed By: lukem
Date: Wed Apr 15 00:32:24 UTC 2009
Modified Files:
src/usr.sbin/btattach: btattach.c btattach.h init_bcm2035.c init_digi.c
init_ericsson.c init_st.c init_swave.c
Log Message:
Fix -Wsign-compare issues.
(Use %u not %d for unsigned ints.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/btattach/btattach.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/btattach/btattach.h \
src/usr.sbin/btattach/init_bcm2035.c src/usr.sbin/btattach/init_digi.c \
src/usr.sbin/btattach/init_ericsson.c src/usr.sbin/btattach/init_st.c \
src/usr.sbin/btattach/init_swave.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.2 src/usr.sbin/btattach/btattach.c:1.3
--- src/usr.sbin/btattach/btattach.c:1.2 Mon Jul 21 13:36:57 2008
+++ src/usr.sbin/btattach/btattach.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.2 2008/07/21 13:36:57 lukem Exp $ */
+/* $NetBSD: btattach.c,v 1.3 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btattach.c,v 1.2 2008/07/21 13:36:57 lukem Exp $");
+__RCSID("$NetBSD: btattach.c,v 1.3 2009/04/15 00:32:23 lukem Exp $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -265,7 +265,7 @@
static void
usage(void)
{
- int i;
+ size_t i;
fprintf(stderr,
"Usage: %s [-dfop] [-i speed] [type] tty speed\n"
Index: src/usr.sbin/btattach/btattach.h
diff -u src/usr.sbin/btattach/btattach.h:1.1 src/usr.sbin/btattach/btattach.h:1.2
--- src/usr.sbin/btattach/btattach.h:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/btattach.h Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.h,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: btattach.h,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -36,7 +36,7 @@
const char * descr; /* long description */
devinit_t * init; /* init function */
tcflag_t cflag; /* default cflags */
- int speed; /* default baudrate */
+ unsigned int speed; /* default baudrate */
};
devinit_t init_bcm2035;
Index: src/usr.sbin/btattach/init_bcm2035.c
diff -u src/usr.sbin/btattach/init_bcm2035.c:1.1 src/usr.sbin/btattach/init_bcm2035.c:1.2
--- src/usr.sbin/btattach/init_bcm2035.c:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/init_bcm2035.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_bcm2035.c,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: init_bcm2035.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_bcm2035.c,v 1.1 2008/04/15 11:17:48 plunky Exp $");
+__RCSID("$NetBSD: init_bcm2035.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -66,7 +66,7 @@
case B460800: rate = 0xfd22; break;
case B921600: rate = 0xff55; break;
default:
- errx(EXIT_FAILURE, "invalid speed for bcm2035: %d\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for bcm2035: %u\n", speed);
};
rate = htole16(rate);
Index: src/usr.sbin/btattach/init_digi.c
diff -u src/usr.sbin/btattach/init_digi.c:1.1 src/usr.sbin/btattach/init_digi.c:1.2
--- src/usr.sbin/btattach/init_digi.c:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/init_digi.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_digi.c,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: init_digi.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_digi.c,v 1.1 2008/04/15 11:17:48 plunky Exp $");
+__RCSID("$NetBSD: init_digi.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -53,7 +53,7 @@
case B57600: rate = 0x08; break;
case B115200: rate = 0x09; break;
default:
- errx(EXIT_FAILURE, "invalid speed for digi: %d\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for digi: %u\n", speed);
}
uart_send_cmd(fd, HCI_CMD_DIGIANSWER_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_ericsson.c
diff -u src/usr.sbin/btattach/init_ericsson.c:1.1 src/usr.sbin/btattach/init_ericsson.c:1.2
--- src/usr.sbin/btattach/init_ericsson.c:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/init_ericsson.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_ericsson.c,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: init_ericsson.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_ericsson.c,v 1.1 2008/04/15 11:17:48 plunky Exp $");
+__RCSID("$NetBSD: init_ericsson.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -78,7 +78,7 @@
case 300000: rate = 0x27; break;
case 400000: rate = 0x2b; break;
default:
- errx(EXIT_FAILURE, "invalid speed for ericsson: %d\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for ericsson: %u\n", speed);
}
uart_send_cmd(fd, HCI_CMD_ERICSSON_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_st.c
diff -u src/usr.sbin/btattach/init_st.c:1.1 src/usr.sbin/btattach/init_st.c:1.2
--- src/usr.sbin/btattach/init_st.c:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/init_st.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_st.c,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: init_st.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_st.c,v 1.1 2008/04/15 11:17:48 plunky Exp $");
+__RCSID("$NetBSD: init_st.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -59,7 +59,7 @@
case B460800: rate = 0x13; break;
case B921600: rate = 0x14; break;
default:
- errx(EXIT_FAILURE, "invalid speed for st: %d\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for st: %u\n", speed);
}
uart_send_cmd(fd, HCI_CMD_ST_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_swave.c
diff -u src/usr.sbin/btattach/init_swave.c:1.1 src/usr.sbin/btattach/init_swave.c:1.2
--- src/usr.sbin/btattach/init_swave.c:1.1 Tue Apr 15 11:17:48 2008
+++ src/usr.sbin/btattach/init_swave.c Wed Apr 15 00:32:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_swave.c,v 1.1 2008/04/15 11:17:48 plunky Exp $ */
+/* $NetBSD: init_swave.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_swave.c,v 1.1 2008/04/15 11:17:48 plunky Exp $");
+__RCSID("$NetBSD: init_swave.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -78,7 +78,7 @@
case B57600: cp.transport_rate = 0x01; break;
case B115200: cp.transport_rate = 0x00; break;
default:
- errx(EXIT_FAILURE, "invalid speed for swave: %d\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for swave: %u\n", speed);
}
uart_send_cmd(fd, HCI_CMD_SWAVE_PARAM_ACCESS_SET, &cp, sizeof(cp));
