Module Name: src
Committed By: isaki
Date: Sat Aug 24 05:51:06 UTC 2019
Modified Files:
src/usr.bin/audiocfg: audiodev.c main.c
Log Message:
Check mode argument earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/audiocfg/audiodev.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/audiocfg/main.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/audiodev.c
diff -u src/usr.bin/audiocfg/audiodev.c:1.10 src/usr.bin/audiocfg/audiodev.c:1.11
--- src/usr.bin/audiocfg/audiodev.c:1.10 Sat Aug 24 05:45:24 2019
+++ src/usr.bin/audiocfg/audiodev.c Sat Aug 24 05:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodev.c,v 1.10 2019/08/24 05:45:24 isaki Exp $ */
+/* $NetBSD: audiodev.c,v 1.11 2019/08/24 05:51:06 isaki Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -282,11 +282,6 @@ audiodev_set_param(struct audiodev *adev
ai.record.sample_rate = freq;
}
- if (setmode == 0) {
- errno = EINVAL;
- return -1;
- }
-
ai.mode = setmode;
printf("setting %s to %s:%u, %uch, %uHz\n",
adev->xname, encname, prec, ch, freq);
Index: src/usr.bin/audiocfg/main.c
diff -u src/usr.bin/audiocfg/main.c:1.12 src/usr.bin/audiocfg/main.c:1.13
--- src/usr.bin/audiocfg/main.c:1.12 Sat Aug 24 05:45:25 2019
+++ src/usr.bin/audiocfg/main.c Sat Aug 24 05:51:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.12 2019/08/24 05:45:25 isaki Exp $ */
+/* $NetBSD: main.c,v 1.13 2019/08/24 05:51:06 isaki Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -222,6 +222,9 @@ main(int argc, char *argv[])
else
usage(argv[0]);
}
+ if (mode == 0)
+ usage(argv[0]);
+ /* NOTREACHED */
enc = argv[4];
prec = strtoul(argv[5], NULL, 10);
if (errno)
