[src/trunk]: src/lib/libossaudio fix typo, WARNS=5

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

details:   https://anonhg.NetBSD.org/src/rev/9548abd01a6d
branches:  trunk
changeset: 779124:9548abd01a6d
user:      christos <christos%NetBSD.org@localhost>
date:      Sat May 05 15:57:45 2012 +0000

description:
fix typo, WARNS=5

diffstat:

 lib/libossaudio/Makefile    |   4 ++--
 lib/libossaudio/ossaudio.c  |  10 +++++-----
 lib/libossaudio/soundcard.h |   4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 663e51ec2bf6 -r 9548abd01a6d lib/libossaudio/Makefile
--- a/lib/libossaudio/Makefile  Sat May 05 15:08:29 2012 +0000
+++ b/lib/libossaudio/Makefile  Sat May 05 15:57:45 2012 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.9 2012/03/21 10:08:30 matt Exp $
+#      $NetBSD: Makefile,v 1.10 2012/05/05 15:57:45 christos Exp $
 
-WARNS= 2
+WARNS= 5
 
 LIB=   ossaudio
 MAN=   ossaudio.3
diff -r 663e51ec2bf6 -r 9548abd01a6d lib/libossaudio/ossaudio.c
--- a/lib/libossaudio/ossaudio.c        Sat May 05 15:08:29 2012 +0000
+++ b/lib/libossaudio/ossaudio.c        Sat May 05 15:57:45 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $   */
+/*     $NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.27 2012/05/04 11:48:12 christos Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.28 2012/05/05 15:57:45 christos Exp $");
 
 /*
  * This is an OSS (Linux) sound API emulator.
@@ -549,7 +549,7 @@
        mixer_devinfo_t mi;
        int i, j, e;
        static struct {
-               char *name;
+               const char *name;
                int code;
        } *dp, devs[] = {
                { AudioNmicrophone,     SOUND_MIXER_MIC },
@@ -574,7 +574,7 @@
 /*             { AudioNmixerout,       ?? },*/
                { 0, -1 }
        };
-       static struct audiodevinfo devcache = { 0 };
+       static struct audiodevinfo devcache = { .done = 0 };
        struct audiodevinfo *di = &devcache;
        struct stat sb;
        size_t mlen, dlen;
@@ -826,7 +826,7 @@
 setblocksize(int fd, struct audio_info *info)
 {
        struct audio_info set;
-       int s;
+       size_t s;
 
        if (info->blocksize & (info->blocksize-1)) {
                for(s = 32; s < info->blocksize; s <<= 1)
diff -r 663e51ec2bf6 -r 9548abd01a6d lib/libossaudio/soundcard.h
--- a/lib/libossaudio/soundcard.h       Sat May 05 15:08:29 2012 +0000
+++ b/lib/libossaudio/soundcard.h       Sat May 05 15:57:45 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: soundcard.h,v 1.21 2012/05/05 15:04:57 christos Exp $  */
+/*     $NetBSD: soundcard.h,v 1.22 2012/05/05 15:57:45 christos Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -297,7 +297,7 @@
  * else we depend on <sys/ioctl.h> to do it for us. We do it this way, so
  * that we don't define the prototype twice.
  */
-#ifndef _SYS_IOCTL_H
+#ifndef _SYS_IOCTL_H_
 #include <sys/ioctl.h>
 #else
 __BEGIN_DECLS