CVS commit: src/usr.bin/cdplay

[Luke Mewburn]

Module Name:    src
Committed By:   lukem
Date:           Sat Apr 11 11:52:35 UTC 2009

Modified Files:
        src/usr.bin/cdplay: cdplay.c

Log Message:
fix -W sign-compare issues.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/cdplay/cdplay.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.bin/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.41 src/usr.bin/cdplay/cdplay.c:1.42
--- src/usr.bin/cdplay/cdplay.c:1.41	Sun Feb 22 08:32:25 2009
+++ src/usr.bin/cdplay/cdplay.c	Sat Apr 11 11:52:35 2009
@@ -1,4 +1,4 @@
-/* 	$NetBSD: cdplay.c,v 1.41 2009/02/22 08:32:25 dholland Exp $	*/
+/* 	$NetBSD: cdplay.c,v 1.42 2009/04/11 11:52:35 lukem Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: cdplay.c,v 1.41 2009/02/22 08:32:25 dholland Exp $");
+__RCSID("$NetBSD: cdplay.c,v 1.42 2009/04/11 11:52:35 lukem Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -603,8 +603,8 @@
 int
 play(const char *arg, int fromuser)
 {
-	int rv, n, start, end, istart, iend, blk, len, relend;
-	u_int tr1, tr2, m1, m2, s1, s2, f1, f2, tm, ts, tf;
+	int rv, start, end, istart, iend, blk, len, relend;
+	u_int n, tr1, tr2, m1, m2, s1, s2, f1, f2, tm, ts, tf;
 	struct ioc_toc_header h;
 
 	if (shuffle && fromuser) {
@@ -878,8 +878,9 @@
 	if (dir == 0 || shuffle != 0) {
 		if (fromuser || (rv != CD_AS_PLAY_IN_PROGRESS &&
 		    rv != CD_AS_PLAY_PAUSED))
-			trk = shuffle < 0 ? (-shuffle) : (h.starting_track +
-			    arc4random() % (h.ending_track - h.starting_track + 1));
+			trk = shuffle < 0 ? (-shuffle) :
+			    (int)((h.starting_track +
+			    arc4random() % (h.ending_track - h.starting_track + 1)));
 		else
 			return (0);
 	} else {
@@ -1192,7 +1193,8 @@
 	struct ioc_toc_header h;
 	u_int mm, ss, ff;
 	int rv;
-	int lba, i, n, rc;
+	int i, n, rc;
+	uint32_t lba;
 
 	if (!tbvalid) {
 		if ((rc = ioctl(fd, CDIOREADTOCHEADER, &h)) < 0) {
@@ -1263,7 +1265,7 @@
 {
 	const struct cmdtab *c, *mc;
 	char *p, *q;
-	int len;
+	unsigned int len;
 
 	for (p = buf; isspace((unsigned char)*p); p++)
 		continue;
@@ -1297,7 +1299,7 @@
 		}
 		/* Try short hand forms then... */
 		if (len >= c->min && strncasecmp(buf, c->name, len) == 0) {
-			if (*cmd != -1 && *cmd != c->command) {
+			if (*cmd != -1 && *cmd != (int)c->command) {
 				warnx("ambiguous command");
 				return (0);
 			}