summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2018-12-18 18:40:28 +0000
committerJohn Levon <john.levon@joyent.com>2019-03-19 16:01:47 +0000
commitfefb716a9c60aee35065c9c8fb74b17ccf5ae303 (patch)
treede22a45d95fe5fbe0226f3058db7dad78e6c342b /usr/src
parent9c2acf00e275b6b2125a306f33cdddcc58393220 (diff)
downloadillumos-joyent-fefb716a9c60aee35065c9c8fb74b17ccf5ae303.tar.gz
10101 audio tools need smatch fixes
Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Gergő Doma <domag02@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/audio/audioplay/audioplay.c7
-rw-r--r--usr/src/cmd/audio/audiorecord/audiorecord.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/usr/src/cmd/audio/audioplay/audioplay.c b/usr/src/cmd/audio/audioplay/audioplay.c
index 882c4d9087..ad225bb55e 100644
--- a/usr/src/cmd/audio/audioplay/audioplay.c
+++ b/usr/src/cmd/audio/audioplay/audioplay.c
@@ -23,6 +23,10 @@
* Use is subject to license terms.
*/
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
/* Command-line audio play utility */
#include <stdio.h>
@@ -802,7 +806,8 @@ closeinput:;
(void) close(ifd); /* close input file */
if (Errdetect) {
cnt = 0;
- audio_set_play_error(Audio_fd, (unsigned int *)&cnt);
+ (void) audio_set_play_error(Audio_fd,
+ (unsigned int *)&cnt);
if (cnt) {
Error(stderr,
MGET("%s: output underflow in %s\n"),
diff --git a/usr/src/cmd/audio/audiorecord/audiorecord.c b/usr/src/cmd/audio/audiorecord/audiorecord.c
index 1879f238fa..6195ffe351 100644
--- a/usr/src/cmd/audio/audiorecord/audiorecord.c
+++ b/usr/src/cmd/audio/audiorecord/audiorecord.c
@@ -23,6 +23,10 @@
* Use is subject to license terms.
*/
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
/* Command-line audio record utility */
#include <stdio.h>
@@ -773,7 +777,7 @@ parse_sample_rate(char *s, unsigned *rate)
if (*cp != NULL) {
if ((*cp == 'k') || (*cp == 'K')) {
drate *= 1000.0;
- } else if ((*cp != 'h') || (*cp != 'H')) {
+ } else if ((*cp != 'h') && (*cp != 'H')) {
/* bogus! */
Error(stderr,
MGET("invalid sample rate: %s\n"), s);