Module Name: src
Committed By: christos
Date: Sat May 5 15:57:45 UTC 2012
Modified Files:
src/lib/libossaudio: Makefile ossaudio.c soundcard.h
Log Message:
fix typo, WARNS=5
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libossaudio/Makefile
cvs rdiff -u -r1.27 -r1.28 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libossaudio/soundcard.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/Makefile
diff -u src/lib/libossaudio/Makefile:1.9 src/lib/libossaudio/Makefile:1.10
--- src/lib/libossaudio/Makefile:1.9 Wed Mar 21 06:08:30 2012
+++ src/lib/libossaudio/Makefile Sat May 5 11:57:45 2012
@@ -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
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.27 src/lib/libossaudio/ossaudio.c:1.28
--- src/lib/libossaudio/ossaudio.c:1.27 Fri May 4 07:48:12 2012
+++ src/lib/libossaudio/ossaudio.c Sat May 5 11:57:45 2012
@@ -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 @@ getdevinfo(int fd)
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 @@ getdevinfo(int fd)
/* { 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 @@ static void
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)
Index: src/lib/libossaudio/soundcard.h
diff -u src/lib/libossaudio/soundcard.h:1.21 src/lib/libossaudio/soundcard.h:1.22
--- src/lib/libossaudio/soundcard.h:1.21 Sat May 5 11:04:57 2012
+++ src/lib/libossaudio/soundcard.h Sat May 5 11:57:45 2012
@@ -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 @@ typedef struct buffmem_desc {
* 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
