Module Name: src
Committed By: dholland
Date: Sun Aug 11 06:31:00 UTC 2013
Modified Files:
src/usr.bin/audiocfg: Makefile audiodev.c audiodev.h dtmf.c
Log Message:
Pass WARNS=5.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/audiocfg/Makefile \
src/usr.bin/audiocfg/audiodev.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/audiocfg/audiodev.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/audiocfg/dtmf.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/audiocfg/Makefile
diff -u src/usr.bin/audiocfg/Makefile:1.3 src/usr.bin/audiocfg/Makefile:1.4
--- src/usr.bin/audiocfg/Makefile:1.3 Wed Sep 1 09:04:16 2010
+++ src/usr.bin/audiocfg/Makefile Sun Aug 11 06:31:00 2013
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/09/01 09:04:16 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/11 06:31:00 dholland Exp $
PROG= audiocfg
SRCS= audiodev.c drvctl.c dtmf.c
SRCS+= main.c
-WARNS= 3
LDADD+= -lprop -lm
DPADD+= $(LIBPROP) $(LIBM)
Index: src/usr.bin/audiocfg/audiodev.h
diff -u src/usr.bin/audiocfg/audiodev.h:1.3 src/usr.bin/audiocfg/audiodev.h:1.4
--- src/usr.bin/audiocfg/audiodev.h:1.3 Thu Sep 2 02:17:35 2010
+++ src/usr.bin/audiocfg/audiodev.h Sun Aug 11 06:31:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodev.h,v 1.3 2010/09/02 02:17:35 jmcneill Exp $ */
+/* $NetBSD: audiodev.h,v 1.4 2013/08/11 06:31:00 dholland Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -45,7 +45,7 @@ struct audiodev {
dev_t dev;
bool defaultdev;
- int pchan;
+ unsigned pchan;
audio_device_t audio_device;
Index: src/usr.bin/audiocfg/audiodev.c
diff -u src/usr.bin/audiocfg/audiodev.c:1.4 src/usr.bin/audiocfg/audiodev.c:1.5
--- src/usr.bin/audiocfg/audiodev.c:1.4 Fri Sep 3 19:20:37 2010
+++ src/usr.bin/audiocfg/audiodev.c Sun Aug 11 06:31:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodev.c,v 1.4 2010/09/03 19:20:37 jmcneill Exp $ */
+/* $NetBSD: audiodev.c,v 1.5 2013/08/11 06:31:00 dholland Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -269,15 +269,19 @@ audiodev_test(struct audiodev *adev, uns
off = 0;
while (buflen > 0) {
- size_t wlen = info.play.buffer_size;
+ size_t wlen;
+ ssize_t ret;
+
+ wlen = info.play.buffer_size;
if (wlen > buflen)
wlen = buflen;
- wlen = write(adev->fd, (char *)buf + off, wlen);
- if (wlen == -1) {
+ ret = write(adev->fd, (char *)buf + off, wlen);
+ if (ret == -1) {
perror("write");
rv = -1;
goto done;
}
+ wlen = ret;
off += wlen;
buflen -= wlen;
}
Index: src/usr.bin/audiocfg/dtmf.c
diff -u src/usr.bin/audiocfg/dtmf.c:1.2 src/usr.bin/audiocfg/dtmf.c:1.3
--- src/usr.bin/audiocfg/dtmf.c:1.2 Wed Sep 1 21:54:00 2010
+++ src/usr.bin/audiocfg/dtmf.c Sun Aug 11 06:31:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dtmf.c,v 1.2 2010/09/01 21:54:00 jmcneill Exp $ */
+/* $NetBSD: dtmf.c,v 1.3 2013/08/11 06:31:00 dholland Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -45,7 +45,8 @@ dtmf_create(int16_t *buf, unsigned int s
unsigned short sample_length, unsigned short channels,
unsigned int chanmask, float freq1, float freq2)
{
- int c, i;
+ int c;
+ unsigned i;
size_t sample_count = sample_rate * sample_length;
for (i = 0; i < sample_count; i++) {
