[src/trunk]: src/sys/compat/ossaudio - "source" is u_long in the kernel (and ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/25e10b63dc66
branches:  trunk
changeset: 454711:25e10b63dc66
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 26 01:37:52 2019 +0000

description:
- "source" is u_long in the kernel (and int in userland). Cast -1 to u_long.
- make "s" unsigned since blocksize is too.

diffstat:

 sys/compat/ossaudio/ossaudio.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r c14267cebef2 -r 25e10b63dc66 sys/compat/ossaudio/ossaudio.c
--- a/sys/compat/ossaudio/ossaudio.c    Thu Sep 26 01:36:10 2019 +0000
+++ b/sys/compat/ossaudio/ossaudio.c    Thu Sep 26 01:37:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ossaudio.c,v 1.75 2019/08/23 12:42:14 maxv Exp $       */
+/*     $NetBSD: ossaudio.c,v 1.76 2019/09/26 01:37:52 christos Exp $   */
 
 /*-
  * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.75 2019/08/23 12:42:14 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.76 2019/09/26 01:37:52 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -1087,7 +1087,7 @@
                }
                break;
        case OSS_SOUND_MIXER_READ_RECSRC:
-               if (di->source == -1) {
+               if (di->source == (u_long)-1) {
                        DPRINTF(("%s: OSS_SOUND_MIXER_READ_RECSRC bad source\n",
                            __func__));
                        error = EINVAL;
@@ -1132,7 +1132,7 @@
                break;
        case OSS_SOUND_MIXER_WRITE_RECSRC:
        case OSS_SOUND_MIXER_WRITE_R_RECSRC:
-               if (di->source == -1) {
+               if (di->source == (u_long)-1) {
                        DPRINTF(("%s: OSS_SOUND_MIXER_WRITE_RECSRC bad "
                            "source\n", __func__));
                        error = EINVAL;
@@ -1492,11 +1492,11 @@
 setblocksize(file_t *fp, struct audio_info *info)
 {
        struct audio_info set;
-       int s;
+       u_int s;
 
-        if (info->blocksize & (info->blocksize-1)) {
+        if (info->blocksize & (info->blocksize - 1)) {
                for(s = 32; s < info->blocksize; s <<= 1)
-                       ;
+                       continue;
                AUDIO_INITINFO(&set);
                set.blocksize = s;
                fp->f_ops->fo_ioctl(fp, AUDIO_SETINFO, &set);