Module Name: src
Committed By: lukem
Date: Sat Apr 11 10:43:10 UTC 2009
Modified Files:
src/usr.bin/audio/ctl: ctl.c
src/usr.bin/audio/play: play.c
src/usr.bin/audio/record: record.c
Log Message:
fix -Wsign-compare and other WARNS=4 issues
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/audio/ctl/ctl.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/audio/play/play.c
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/audio/record/record.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/audio/ctl/ctl.c
diff -u src/usr.bin/audio/ctl/ctl.c:1.37 src/usr.bin/audio/ctl/ctl.c:1.38
--- src/usr.bin/audio/ctl/ctl.c:1.37 Mon Apr 28 20:24:12 2008
+++ src/usr.bin/audio/ctl/ctl.c Sat Apr 11 10:43:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ctl.c,v 1.37 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: ctl.c,v 1.38 2009/04/11 10:43:09 lukem Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ctl.c,v 1.37 2008/04/28 20:24:12 martin Exp $");
+__RCSID("$NetBSD: ctl.c,v 1.38 2009/04/11 10:43:09 lukem Exp $");
#endif
@@ -302,11 +302,11 @@
enc.index = i;
if (ioctl(fd, AUDIO_GETENC, &enc) < 0)
break;
- if (pos >= sizeof(encbuf)-1)
+ if (pos >= (int)sizeof(encbuf)-1)
break;
if (pos)
encbuf[pos++] = ',';
- if (pos >= sizeof(encbuf)-1)
+ if (pos >= (int)sizeof(encbuf)-1)
break;
pos += snprintf(encbuf+pos, sizeof(encbuf)-pos, "%s:%d%s",
enc.name, enc.precision,
Index: src/usr.bin/audio/play/play.c
diff -u src/usr.bin/audio/play/play.c:1.49 src/usr.bin/audio/play/play.c:1.50
--- src/usr.bin/audio/play/play.c:1.49 Thu May 29 14:51:27 2008
+++ src/usr.bin/audio/play/play.c Sat Apr 11 10:43:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: play.c,v 1.49 2008/05/29 14:51:27 mrg Exp $ */
+/* $NetBSD: play.c,v 1.50 2009/04/11 10:43:09 lukem Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: play.c,v 1.49 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: play.c,v 1.50 2009/04/11 10:43:09 lukem Exp $");
#endif
@@ -277,19 +277,19 @@
filesize -= hdrlen;
addr = (char *)addr + hdrlen;
- if (filesize < datasize || datasize == 0) {
- if (filesize < datasize)
+ if ((uint64_t)filesize < datasize || datasize == 0) {
+ if ((uint64_t)filesize < datasize)
warnx("bogus datasize: %ld", (u_long)datasize);
datasize = filesize;
}
while (datasize > bufsize) {
- if (write(audiofd, addr, bufsize) != bufsize)
+ if ((size_t)write(audiofd, addr, bufsize) != bufsize)
err(1, "write failed");
addr = (char *)addr + bufsize;
datasize -= bufsize;
}
- if (write(audiofd, addr, (size_t)datasize) != (ssize_t)datasize)
+ if ((size_t)write(audiofd, addr, datasize) != datasize)
err(1, "final write failed");
if (ioctl(audiofd, AUDIO_DRAIN) < 0 && !qflag)
Index: src/usr.bin/audio/record/record.c
diff -u src/usr.bin/audio/record/record.c:1.46 src/usr.bin/audio/record/record.c:1.47
--- src/usr.bin/audio/record/record.c:1.46 Thu May 29 14:51:27 2008
+++ src/usr.bin/audio/record/record.c Sat Apr 11 10:43:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: record.c,v 1.46 2008/05/29 14:51:27 mrg Exp $ */
+/* $NetBSD: record.c,v 1.47 2009/04/11 10:43:10 lukem Exp $ */
/*
* Copyright (c) 1999, 2002 Matthew R. Green
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: record.c,v 1.46 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: record.c,v 1.47 2009/04/11 10:43:10 lukem Exp $");
#endif
@@ -334,11 +334,11 @@
(void)gettimeofday(&start_time, NULL);
while (no_time_limit || timeleft(&start_time, &record_time)) {
- if (read(audiofd, buffer, bufsize) != bufsize)
+ if ((size_t)read(audiofd, buffer, bufsize) != bufsize)
err(1, "read failed");
if (conv_func)
(*conv_func)(buffer, bufsize);
- if (write(outfd, buffer, bufsize) != bufsize)
+ if ((size_t)write(outfd, buffer, bufsize) != bufsize)
err(1, "write failed");
total_size += bufsize;
}
