Tue Nov 3 08:24:33 2020 UTC ()
ossaudio(3): return correctly initialized return value in unlikely
error case. pointed out by tnn.


(nia)
diff -r1.59 -r1.60 src/lib/libossaudio/ossaudio.c

cvs diff -r1.59 -r1.60 src/lib/libossaudio/Attic/ossaudio.c (expand / switch to context diff)
--- src/lib/libossaudio/Attic/ossaudio.c 2020/10/30 21:44:49 1.59
+++ src/lib/libossaudio/Attic/ossaudio.c 2020/11/03 08:24:33 1.60
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.60 2020/11/03 08:24:33 nia Exp $	*/
 
 /*-
  * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.60 2020/11/03 08:24:33 nia Exp $");
 
 /*
  * This is an Open Sound System compatibility layer, which provides
@@ -187,9 +187,9 @@
 			INTARG = 192000;
 		tmpinfo.play.sample_rate =
 		tmpinfo.record.sample_rate = INTARG;
-		if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
+		retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+		if (retval < 0)
 			return retval;
-		}
 		/* FALLTHRU */
 	case SOUND_PCM_READ_RATE:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);