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>
illumos · Mar 19, 2019 · fefb716 · fefb716
1 parent 9c2acf0
commit fefb716
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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);