 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.19 2008/05/29 14:51:27 mrg Exp $	*/
+/*	$NetBSD: audio.c,v 1.20 2011/08/28 01:17:47 joerg Exp $	*/
 /*
  * Copyright (c) 1999 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,76 +22,75 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * XXX this is slightly icky in places...
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: audio.c,v 1.19 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: audio.c,v 1.20 2011/08/28 01:17:47 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "libaudio.h"
 /* what format am i? */
-struct {
+static const struct {
 	const char *fname;
 	int fno;
 } formats[] = {
 	{ "sunau",		AUDIO_FORMAT_SUN },
 	{ "au",			AUDIO_FORMAT_SUN },
 	{ "sun",		AUDIO_FORMAT_SUN },
 	{ "wav",		AUDIO_FORMAT_WAV },
 	{ "wave",		AUDIO_FORMAT_WAV },
 	{ "riff",		AUDIO_FORMAT_WAV },
 	{ "no",			AUDIO_FORMAT_NONE },
 	{ "none",		AUDIO_FORMAT_NONE },
 	{ NULL, -1 }
 };
 int
-audio_format_from_str(str)
+audio_format_from_str(char *str)
 	char *str;
+{
 	int	i;
 	for (i = 0; formats[i].fname; i++)
 		if (strcasecmp(formats[i].fname, str) == 0)
 			break;
 	return (formats[i].fno);
+}
 /* back and forth between encodings */
-struct {
+static const struct {
 	const char *ename;
 	int eno;
 } encs[] = {
 	{ AudioEmulaw,		AUDIO_ENCODING_ULAW },
 	{ "ulaw",		AUDIO_ENCODING_ULAW },
 	{ AudioEalaw, 		AUDIO_ENCODING_ALAW },
 	{ AudioEslinear,	AUDIO_ENCODING_SLINEAR },
 	{ "linear",		AUDIO_ENCODING_SLINEAR },
 	{ AudioEulinear,	AUDIO_ENCODING_ULINEAR },
 	{ AudioEadpcm,		AUDIO_ENCODING_ADPCM },
 	{ "ADPCM",		AUDIO_ENCODING_ADPCM },
 	{ AudioEslinear_le,	AUDIO_ENCODING_SLINEAR_LE },
 	{ "linear_le",		AUDIO_ENCODING_SLINEAR_LE },
 @@ -100,73 +99,67 @@ struct {
 	{ "linear_be",		AUDIO_ENCODING_SLINEAR_BE },
 	{ AudioEulinear_be,	AUDIO_ENCODING_ULINEAR_BE },
 	{ AudioEmpeg_l1_stream,	AUDIO_ENCODING_MPEG_L1_STREAM },
 	{ AudioEmpeg_l1_packets,AUDIO_ENCODING_MPEG_L1_PACKETS },
 	{ AudioEmpeg_l1_system,	AUDIO_ENCODING_MPEG_L1_SYSTEM },
 	{ AudioEmpeg_l2_stream,	AUDIO_ENCODING_MPEG_L2_STREAM },
 	{ AudioEmpeg_l2_packets,AUDIO_ENCODING_MPEG_L2_PACKETS },
 	{ AudioEmpeg_l2_system,	AUDIO_ENCODING_MPEG_L2_SYSTEM },
 	{ NULL, -1 }
 };
 const char *
-audio_enc_from_val(val)
+audio_enc_from_val(int val)
 	int	val;
+{
 	int	i;
 	for (i = 0; encs[i].ename; i++)
 		if (encs[i].eno == val)
 			break;
 	return (encs[i].ename);
+}
 int
-audio_enc_to_val(enc)
+audio_enc_to_val(const char *enc)
 	const	char *enc;
+{
 	int	i;
 	for (i = 0; encs[i].ename; i++)
 		if (strcmp(encs[i].ename, enc) == 0)
 			break;
 	if (encs[i].ename)
 		return (encs[i].eno);
 	else
 		return (AUDIO_ENOENT);
+}
 void
-decode_int(arg, intp)
+decode_int(const char *arg, int *intp)
 	const char *arg;
 	int *intp;
+{
 	char	*ep;
 	int	ret;
 	ret = (int)strtoul(arg, &ep, 10);
 	if (ep[0] == '\0') {
 		*intp = ret;
 		return;
+	}
 	errx(1, "argument `%s' not a valid integer", arg);
+}
 void
-decode_time(arg, tvp)
+decode_time(const char *arg, struct timeval *tvp)
 	const char *arg;
 	struct timeval *tvp;
+{
 	char	*s, *colon, *dot;
 	char	*copy = strdup(arg);
 	int	first;
 	if (copy == NULL)
 		err(1, "could not allocate a copy of %s", arg);
 	tvp->tv_sec = tvp->tv_usec = 0;
 	s = copy;
 	/* handle [hh:]mm:ss.dd */
 	if ((colon = strchr(s, ':')) != NULL) {
 @@ -196,49 +189,46 @@ decode_time(arg, tvp)
 			tvp->tv_usec += base * (dot[i] - '0');
+		}
+	}
 	decode_int(s, &first);
 	tvp->tv_sec += first;
 	free(copy);
+}
 /*
  * decode a string into an encoding value.
  */
 void
-decode_encoding(arg, encp)
+decode_encoding(const char *arg, int *encp)
 	const char *arg;
 	int *encp;
+{
 	size_t	len;
 	int i;
 	len = strlen(arg);
 	for (i = 0; encs[i].ename; i++)
 		if (strncmp(encs[i].ename, arg, len) == 0) {
 			*encp = encs[i].eno;
 			return;
+		}
 	errx(1, "unknown encoding `%s'", arg);
+}
-const char *const audio_errlist[] = {
+static const char *const audio_errlist[] = {
 	"error zero",				/* nothing? */
 	"no audio entry",			/* AUDIO_ENOENT */
 	"short header",				/* AUDIO_ESHORTHDR */
 	"unsupported WAV format",		/* AUDIO_EWAVUNSUPP */
 	"bad (unsupported) WAV PCM format",	/* AUDIO_EWAVBADPCM */
 	"no WAV audio data",			/* AUDIO_EWAVNODATA */
 	"internal error",			/* AUDIO_EINTERNAL */
 };
 const char *
-audio_errstring(errval)
+audio_errstring(int errval)
 	int	errval;
+{
 	errval = -errval;
 	if (errval < 1 || errval > AUDIO_MAXERRNO)
 		return "Invalid error";
 	return audio_errlist[errval];
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: libaudio.h,v 1.16 2009/06/18 02:37:27 mrg Exp $	*/
+/*	$NetBSD: libaudio.h,v 1.17 2011/08/28 01:17:47 joerg Exp $	*/
 /*
  * Copyright (c) 1999, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -149,26 +149,28 @@ typedef struct {
 } __packed wav_audioheaderfmt;
 typedef struct {
 	u_int16_t	len;
 	u_int16_t	valid_bits;
 	u_int32_t	speaker_pos_mask;
 	u_int16_t	sub_tag;
 	u_int8_t	dummy[14];
 } __packed wav_audiohdrextensible;
 /* returns size of header, or -ve for failure */
 ssize_t audio_wav_parse_hdr (void *, size_t, u_int *, u_int *, u_int *, u_int *, size_t *);
 extern int verbose;
 /*
  * audio routine error codes
  */
 #define AUDIO_ENOENT		-1		/* no such audio format */
 #define AUDIO_ESHORTHDR		-2		/* short header */
 #define AUDIO_EWAVUNSUPP	-3		/* WAV: unsupported file */
 #define AUDIO_EWAVBADPCM	-4		/* WAV: bad PCM bps */
 #define AUDIO_EWAVNODATA	-5		/* WAV: missing data */
 #define AUDIO_EINTERNAL		-6		/* internal error */
 #define AUDIO_MAXERRNO		5
 /* and something to get a string associated with this error */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sun.c,v 1.6 2008/05/29 14:51:27 mrg Exp $	*/
+/*	$NetBSD: sun.c,v 1.7 2011/08/28 01:17:47 joerg Exp $	*/
 /*
  * Copyright (c) 2002 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,47 +22,47 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * XXX this is slightly icky in places...
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: sun.c,v 1.6 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: sun.c,v 1.7 2011/08/28 01:17:47 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "libaudio.h"
 /*
  * SunOS/NeXT .au format helpers
  */
-struct {
+static const struct {
 	int	file_encoding;
 	int	encoding;
 	int	precision;
 } file2sw_encodings[] = {
 	{ AUDIO_FILE_ENCODING_MULAW_8,		AUDIO_ENCODING_ULAW,	8 },
 	{ AUDIO_FILE_ENCODING_LINEAR_8,		AUDIO_ENCODING_SLINEAR_BE, 8 },
 	{ AUDIO_FILE_ENCODING_LINEAR_16,	AUDIO_ENCODING_SLINEAR_BE, 16 },
 	{ AUDIO_FILE_ENCODING_LINEAR_24,	AUDIO_ENCODING_SLINEAR_BE, 24 },
 	{ AUDIO_FILE_ENCODING_LINEAR_32,	AUDIO_ENCODING_SLINEAR_BE, 32 },
 #if 0
 	/*
 	 * we should make some of these available.  the, eg ultrasparc, port
 	 * can use the VIS instructions (if available) do do some of these
 @@ -70,45 +70,39 @@ struct {
 	 */
 	{ AUDIO_FILE_ENCODING_FLOAT,		AUDIO_ENCODING_ULAW,	32 },
 	{ AUDIO_FILE_ENCODING_DOUBLE,		AUDIO_ENCODING_ULAW,	64 },
 	{ AUDIO_FILE_ENCODING_ADPCM_G721,	AUDIO_ENCODING_ULAW,	4 },
 	{ AUDIO_FILE_ENCODING_ADPCM_G722,	AUDIO_ENCODING_ULAW,	0 },
 	{ AUDIO_FILE_ENCODING_ADPCM_G723_3,	AUDIO_ENCODING_ULAW,	3 },
 	{ AUDIO_FILE_ENCODING_ADPCM_G723_5,	AUDIO_ENCODING_ULAW,	5 },
 #endif
 	{ AUDIO_FILE_ENCODING_ALAW_8,		AUDIO_ENCODING_ALAW,	8 },
 	{ -1, -1, -1 }
 };
 int
-audio_sun_to_encoding(sun_encoding, encp, precp)
+audio_sun_to_encoding(int sun_encoding, u_int *encp, u_int *precp)
 	int	sun_encoding;
 	u_int	*encp;
 	u_int	*precp;
+{
 	int i;
 	for (i = 0; file2sw_encodings[i].file_encoding != -1; i++)
 		if (file2sw_encodings[i].file_encoding == sun_encoding) {
 			*precp = file2sw_encodings[i].precision;
 			*encp = file2sw_encodings[i].encoding;
 			return (0);
+		}
 	return (1);
+}
 int
-audio_encoding_to_sun(encoding, precision, sunep)
+audio_encoding_to_sun(int encoding, int precision, int *sunep)
 	int	encoding;
 	int	precision;
 	int	*sunep;
+{
 	int i;
 	for (i = 0; file2sw_encodings[i].file_encoding != -1; i++)
 		if (file2sw_encodings[i].encoding == encoding &&
 		    file2sw_encodings[i].precision == precision) {
 			*sunep = file2sw_encodings[i].file_encoding;
 			return (0);
+		}
 	return (1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wav.c,v 1.9 2009/06/18 02:37:27 mrg Exp $	*/
+/*	$NetBSD: wav.c,v 1.10 2011/08/28 01:17:47 joerg Exp $	*/
 /*
  * Copyright (c) 2002, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,93 +23,85 @@
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * WAV support for the audio tools; thanks go to the sox utility for
  * clearing up issues with WAV files.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.9 2009/06/18 02:37:27 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.10 2011/08/28 01:17:47 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include "libaudio.h"
-struct {
+static const struct {
 	int	wenc;
 	const char *wname;
 } wavencs[] = {
 	{ WAVE_FORMAT_UNKNOWN, 	"Microsoft Official Unknown" },
 	{ WAVE_FORMAT_PCM,	"Microsoft PCM" },
 	{ WAVE_FORMAT_ADPCM,	"Microsoft ADPCM" },
 	{ WAVE_FORMAT_ALAW,	"Microsoft A-law" },
 	{ WAVE_FORMAT_MULAW,	"Microsoft mu-law" },
 	{ WAVE_FORMAT_OKI_ADPCM,"OKI ADPCM" },
 	{ WAVE_FORMAT_DIGISTD,	"Digistd format" },
 	{ WAVE_FORMAT_DIGIFIX,	"Digifix format" },
 	{ -1, 			"?Unknown?" },
 };
 const char *
 wav_enc_from_val(int encoding)
+{
 	int	i;
 	for (i = 0; wavencs[i].wenc != -1; i++)
 		if (wavencs[i].wenc == encoding)
 			break;
 	return (wavencs[i].wname);
+}
 extern int verbose;
 /*
  * sample header is:
+ *
  *   RIFF\^@^C^@WAVEfmt ^P^@^@^@^A^@^B^@D<AC>^@^@^P<B1>^B^@^D^@^P^@data^@^@^C^@^@^@^@^@^@^@^@^@^@
+ *
  */
 /*
  * WAV format helpers
  */
 /*
  * find a .wav header, etc. returns header length on success
  */
 ssize_t
-audio_wav_parse_hdr(hdr, sz, enc, prec, sample, channels, datasize)
+audio_wav_parse_hdr(void *hdr, size_t sz, u_int *enc, u_int *prec,
-	void	*hdr;
+    u_int *sample, u_int *channels, size_t *datasize)
 	size_t	sz;
 	u_int	*enc;
 	u_int	*prec;
 	u_int	*sample;
 	u_int	*channels;
 	size_t *datasize;
+{
 	char	*where = hdr, *owhere;
 	wav_audioheaderpart part;
 	wav_audioheaderfmt fmt;
 	wav_audiohdrextensible ext;
 	char	*end = (((char *)hdr) + sz);
 	u_int	newenc, newprec;
 	u_int16_t fmttag;
 	static const char
 	    strfmt[4] = "fmt ",
 	    strRIFF[4] = "RIFF",
 	    strWAVE[4] = "WAVE",
 	    strdata[4] = "data";

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ctl.c,v 1.38 2009/04/11 10:43:09 lukem Exp $	*/
+/*	$NetBSD: ctl.c,v 1.39 2011/08/28 01:17:48 joerg Exp $	*/
 /*
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (augustss@NetBSD.org).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,63 +21,62 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ctl.c,v 1.38 2009/04/11 10:43:09 lukem Exp $");
+__RCSID("$NetBSD: ctl.c,v 1.39 2011/08/28 01:17:48 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/audioio.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <paths.h>
 #include "libaudio.h"
-struct field *findfield (const char *name);
+static struct field *findfield(const char *name);
-void prfield (struct field *p, const char *sep);
+static void prfield(const struct field *p, const char *sep);
-void rdfield (struct field *p, char *q);
+static void rdfield(struct field *p, char *q);
-void getinfo (int fd);
+static void getinfo(int fd);
-void audioctl_write (int, int, char *[]);
+static void audioctl_write(int, int, char *[]);
-void usage (void);
+__dead static void usage(void);
 int main (int argc, char **argv);
-audio_device_t adev;
+static audio_device_t adev;
-audio_info_t info;
+static audio_info_t info;
-char encbuf[1000];
+static char encbuf[1000];
-int properties, fullduplex, rerror;
+static int properties, fullduplex, rerror;
-struct field {
+static struct field {
 	const char *name;
 	void *valp;
 	int format;
 #define STRING 1
 #define INT 2
 #define UINT 3
 #define P_R 4
 #define ULONG 5	/* XXX obsolete now */
 #define UCHAR 6
 #define ENC 7
 #define PROPS 8
 #define XINT 9
 #define	FORMAT 10
 @@ -130,79 +129,76 @@ struct field {
 	{ "record.seek",	&info.record.seek,	UINT,	READONLY },
 	{ "record.samples",	&info.record.samples,	UINT,	READONLY },
 	{ "record.eof",		&info.record.eof,	UINT,	READONLY },
 	{ "record.pause",	&info.record.pause,	UCHAR,	0 },
 	{ "record.error",	&info.record.error,	UCHAR,	READONLY },
 	{ "record.waiting",	&info.record.waiting,	UCHAR,	READONLY },
 	{ "record.open",	&info.record.open,	UCHAR,	READONLY },
 	{ "record.active",	&info.record.active,	UCHAR,	READONLY },
 	{ "record.buffer_size",	&info.record.buffer_size,UINT,	0 },
 	{ "record.errors",	&rerror,		INT,	READONLY },
 	{ .name = NULL },
 };
-static struct {
+static const struct {
 	const char *name;
 	u_int prop;
 } props[] = {
 	{ "full_duplex",	AUDIO_PROP_FULLDUPLEX },
 	{ "mmap",		AUDIO_PROP_MMAP },
 	{ "independent",	AUDIO_PROP_INDEPENDENT },
 	{ .name = NULL },
 };
-struct field *
+static struct field *
-findfield(name)
+findfield(const char *name)
 	const char *name;
+{
 	int i;
 	for (i = 0; fields[i].name; i++)
 		if (strcmp(fields[i].name, name) == 0)
 			return &fields[i];
 	return 0;
+}
-void
+static void
-prfield(p, sep)
+prfield(const struct field *p, const char *sep)
 	struct field *p;
 	const char *sep;
+{
 	u_int v;
 	const char *cm, *encstr;
 	int i;
 	if (sep)
 		printf("%s%s", p->name, sep);
 	switch(p->format) {
 	case STRING:
-		printf("%s", (char*)p->valp);
+		printf("%s", (const char*)p->valp);
 		break;
 	case INT:
-		printf("%d", *(int*)p->valp);
+		printf("%d", *(const int*)p->valp);
 		break;
 	case UINT:
-		printf("%u", *(u_int*)p->valp);
+		printf("%u", *(const u_int*)p->valp);
 		break;
 	case XINT:
-		printf("0x%x", *(u_int*)p->valp);
+		printf("0x%x", *(const u_int*)p->valp);
 		break;
 	case UCHAR:
-		printf("%u", *(u_char*)p->valp);
+		printf("%u", *(const u_char*)p->valp);
 		break;
 	case ULONG:
-		printf("%lu", *(u_long*)p->valp);
+		printf("%lu", *(const u_long*)p->valp);
 		break;
 	case P_R:
-		v = *(u_int*)p->valp;
+		v = *(const u_int*)p->valp;
 		cm = "";
 		if (v & AUMODE_PLAY) {
 			if (v & AUMODE_PLAY_ALL)
 				printf("play");
 			else
 				printf("playsync");
 			cm = ",";
+		}
 		if (v & AUMODE_RECORD)
 			printf("%srecord", cm);
 		break;
 	case ENC:
 		v = *(u_int*)p->valp;
 @@ -225,30 +221,28 @@ prfield(p, sep)
 		prfield(p + 1, 0);
 		printf(",");
 		prfield(p + 3, 0);
 		printf(",");
 		prfield(p + 4, 0);
 		printf(",");
 		prfield(p + 5, 0);
 		break;
 	default:
 		errx(1, "Invalid print format.");
+	}
+}
-void
+static void
-rdfield(p, q)
+rdfield(struct field *p, char *q)
 	struct field *p;
 	char *q;
+{
 	int enc;
 	u_int u;
 	char *s;
 	switch(p->format) {
 	case UINT:
 		if (sscanf(q, "%u", (unsigned int *)p->valp) != 1)
 			errx(1, "Bad number: %s", q);
 		break;
 	case UCHAR:
 		if (sscanf(q, "%u", &u) != 1)
 			errx(1, "Bad number: %s", q);
 @@ -279,29 +273,28 @@ rdfield(p, q)
 			rdfield(p + 4, s);
 		s = strsep(&q, ",");
 		if (s)
 			rdfield(p + 5, s);
 		if (!s || q)
 			errx(1, "Bad format");
 		break;
 	default:
 		errx(1, "Invalid read format.");
+	}
 	p->flags |= SET;
+}
-void
+static void
-getinfo(fd)
+getinfo(int fd)
 	int fd;
+{
 	int pos, i;
 	if (ioctl(fd, AUDIO_GETDEV, &adev) < 0)
 		err(1, "AUDIO_GETDEV");
 	for (pos = 0, i = 0; ; i++) {
 		audio_encoding_t enc;
 		enc.index = i;
 		if (ioctl(fd, AUDIO_GETENC, &enc) < 0)
 			break;
 		if (pos >= (int)sizeof(encbuf)-1)
 			break;
 		if (pos)
 @@ -312,41 +305,39 @@ getinfo(fd)
 			enc.name, enc.precision,
 			enc.flags & AUDIO_ENCODINGFLAG_EMULATED ? "*" : "");
+	}
 	if (ioctl(fd, AUDIO_GETFD, &fullduplex) < 0)
 		err(1, "AUDIO_GETFD");
 	if (ioctl(fd, AUDIO_GETPROPS, &properties) < 0)
 		err(1, "AUDIO_GETPROPS");
 	if (ioctl(fd, AUDIO_RERROR, &rerror) < 0)
 		err(1, "AUDIO_RERROR");
 	if (ioctl(fd, AUDIO_GETINFO, &info) < 0)
 		err(1, "AUDIO_GETINFO");
+}
-void
+static void
-usage()
+usage(void)
+{
 	const char *prog = getprogname();
 	fprintf(stderr, "Usage: %s [-d file] [-n] name ...\n", prog);
 	fprintf(stderr, "Usage: %s [-d file] [-n] -w name=value ...\n", prog);
 	fprintf(stderr, "Usage: %s [-d file] [-n] -a\n", prog);
 	exit(1);
+}
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char **argv;
+{
 	int fd, i, ch;
 	int aflag = 0, wflag = 0;
 	const char *deffile = _PATH_AUDIOCTL;
 	const char *file;
 	const char *sep = "=";
 	file = getenv("AUDIOCTLDEVICE");
 	if (file == NULL)
 		file = deffile;
 	while ((ch = getopt(argc, argv, "ad:f:nw")) != -1) {
 		switch(ch) {
 @@ -418,31 +409,28 @@ main(argc, argv)
 						warnx("field %s does not exist", *argv);
 				} else {
 					prfield(p, sep);
 					printf("\n");
+				}
 				argv++;
+			}
+		}
 	} else
 		usage();
 	exit(0);
+}
-void
+static void
-audioctl_write(fd, argc, argv)
+audioctl_write(int fd, int argc, char *argv[])
 	int fd;
 	int argc;
 	char *argv[];
+{
 	struct field *p;
 	AUDIO_INITINFO(&info);
 	while (argc--) {
 		char *q;
 		q = strchr(*argv, '=');
 		if (q) {
 			*q++ = 0;
 			p = findfield(*argv);
 			if (p == 0)
 				warnx("field `%s' does not exist", *argv);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: play.c,v 1.53 2010/12/29 18:48:40 wiz Exp $	*/
+/*	$NetBSD: play.c,v 1.54 2011/08/28 01:17:48 joerg Exp $	*/
 /*
  * Copyright (c) 1999, 2000, 2001, 2002, 2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,78 +18,75 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: play.c,v 1.53 2010/12/29 18:48:40 wiz Exp $");
+__RCSID("$NetBSD: play.c,v 1.54 2011/08/28 01:17:48 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include <paths.h>
 #include "libaudio.h"
-int main(int, char *[]);
+static void usage(void) __dead;
-void usage(void);
+static void play(char *);
-void play(char *);
+static void play_fd(const char *, int);
-void play_fd(const char *, int);
+static ssize_t audioctl_write_fromhdr(void *, size_t, int, size_t *, const char *);
-ssize_t audioctl_write_fromhdr(void *, size_t, int, size_t *, const char *);
+static void cleanup(int) __dead;
 void cleanup(int) __dead;
 static audio_info_t	info;
-audio_info_t	info;
+static int	volume;
-int	volume;
+static int	balance;
-int	balance;
+static int	port;
-int	port;
+static int	fflag;
-int	fflag;
+static int	qflag;
 int	qflag;
 int	verbose;
-int	sample_rate;
+static int	sample_rate;
-int	encoding;
+static int	encoding;
-char	*encoding_str;
+static char	*encoding_str;
-int	precision;
+static int	precision;
-int	channels;
+static int	channels;
-char	const *play_errstring = NULL;
+static char	const *play_errstring = NULL;
-size_t	bufsize;
+static size_t	bufsize;
-int	audiofd;
+static int	audiofd;
-int	exitstatus = EXIT_SUCCESS;
+static int	exitstatus = EXIT_SUCCESS;
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char *argv[];
+{
 	size_t	len;
 	int	ch;
 	int	iflag = 0;
 	const char *defdevice = _PATH_SOUND;
 	const char *device = NULL;
 	while ((ch = getopt(argc, argv, "b:B:C:c:d:e:fhip:P:qs:Vv:")) != -1) {
 		switch (ch) {
 		case 'b':
 			decode_int(optarg, &balance);
 			if (balance < 0 || balance > 64)
 				errx(1, "balance must be between 0 and 63");
 @@ -194,43 +191,41 @@ main(argc, argv)
 	signal(SIGTERM, cleanup);
 	signal(SIGHUP, cleanup);
 	if (*argv)
 		do
 			play(*argv++);
 		while (*argv);
 	else
 		play_fd("standard input", STDIN_FILENO);
 	cleanup(0);
+}
-void
+static void
-cleanup(signo)
+cleanup(int signo)
 	int signo;
+{
 	(void)ioctl(audiofd, AUDIO_FLUSH, NULL);
 	(void)ioctl(audiofd, AUDIO_SETINFO, &info);
 	close(audiofd);
 	if (signo != 0) {
 		(void)raise_default_signal(signo);
+	}
 	exit(exitstatus);
+}
-void
+static void
-play(file)
+play(char *file)
 	char *file;
+{
 	struct stat sb;
 	void *addr, *oaddr;
 	off_t	filesize;
 	size_t	sizet_filesize;
 	size_t datasize = 0;
 	ssize_t	hdrlen;
 	int fd;
 	if (file[0] == '-' && file[1] == 0) {
 		play_fd("standard input", STDIN_FILENO);
 		return;
+	}
 @@ -297,30 +292,28 @@ play(file)
 		err(1, "final write failed");
 	if (ioctl(audiofd, AUDIO_DRAIN) < 0 && !qflag)
 		warn("audio drain ioctl failed");
 	if (munmap(oaddr, sizet_filesize) < 0)
 		err(1, "munmap failed");
 	close(fd);
+}
 /*
  * play the file on the file descriptor fd
  */
-void
+static void
-play_fd(file, fd)
+play_fd(const char *file, int fd)
 	const char *file;
 	int     fd;
+{
 	char    *buffer = malloc(bufsize);
 	ssize_t hdrlen;
 	int     nr, nw;
 	size_t	datasize = 0;
 	size_t	dataout = 0;
 	if (buffer == NULL)
 		err(1, "malloc of read buffer failed");
 	nr = read(fd, buffer, bufsize);
 	if (nr < 0)
 		goto read_error;
 @@ -363,33 +356,28 @@ play_fd(file, fd)
 	return;
 read_error:
 	err(1, "read of standard input failed");
 write_error:
 	err(1, "audio device write failed");
+}
 /*
  * only support sun and wav audio files so far ...
+ *
  * XXX this should probably be mostly part of libaudio, but it
  * uses the local "info" variable. blah... fix me!
  */
-ssize_t
+static ssize_t
-audioctl_write_fromhdr(hdr, fsz, fd, datasize, file)
+audioctl_write_fromhdr(void *hdr, size_t fsz, int fd, size_t *datasize, const char *file)
 	void	*hdr;
 	size_t	fsz;
 	int	fd;
 	size_t	*datasize;
 	const char	*file;
+{
 	sun_audioheader	*sunhdr;
 	ssize_t	hdr_len = 0;
 	AUDIO_INITINFO(&info);
 	sunhdr = hdr;
 	if (ntohl(sunhdr->magic) == AUDIO_FILE_MAGIC) {
 		if (audio_sun_to_encoding(ntohl(sunhdr->encoding),
 		    &info.play.encoding, &info.play.precision)) {
 			if (!qflag)
 				warnx("unknown unsupported Sun audio encoding"
 				      " format %d", ntohl(sunhdr->encoding));
 			if (fflag)
 @@ -458,28 +446,28 @@ set_audio_mode:
 		   info.play.channels,
 		   (long long)*datasize,
 		   info.play.precision,
 		   enc ? " encoding=" : "",
 		   enc ? enc : "");
+	}
 	if (ioctl(fd, AUDIO_SETINFO, &info) < 0)
 		err(1, "failed to set audio info");
 	return (hdr_len);
+}
-void
+static void
-usage()
+usage(void)
+{
 	fprintf(stderr, "Usage: %s [-hiqV] [options] files\n", getprogname());
 	fprintf(stderr, "Options:\n\t"
 	    "-B buffer size\n\t"
 	    "-b balance (0-63)\n\t"
 	    "-d audio device\n\t"
 	    "-f force settings\n\t"
 	    "\t-c forced channels\n\t"
 	    "\t-e forced encoding\n\t"
 	    "\t-P forced precision\n\t"
 	    "\t-s forced sample rate\n\t"
 	    "-i header information\n\t"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: record.c,v 1.50 2010/12/29 18:49:41 wiz Exp $	*/
+/*	$NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $	*/
 /*
  * Copyright (c) 1999, 2002, 2003, 2005, 2010 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,85 +22,82 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * SunOS compatible audiorecord(1)
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: record.c,v 1.50 2010/12/29 18:49:41 wiz Exp $");
+__RCSID("$NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include "libaudio.h"
 #include "auconv.h"
-audio_info_t info, oinfo;
+static audio_info_t info, oinfo;
-ssize_t	total_size = -1;
+static ssize_t	total_size = -1;
-const char *device;
+static const char *device;
-int	format = AUDIO_FORMAT_DEFAULT;
+static int	format = AUDIO_FORMAT_DEFAULT;
-char	*header_info;
+static char	*header_info;
-char	default_info[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
+static char	default_info[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
-int	audiofd, outfd;
+static int	audiofd, outfd;
-int	qflag, aflag, fflag;
+static int	qflag, aflag, fflag;
 int	verbose;
-int	monitor_gain, omonitor_gain;
+static int	monitor_gain, omonitor_gain;
-int	gain;
+static int	gain;
-int	balance;
+static int	balance;
-int	port;
+static int	port;
-int	encoding;
+static int	encoding;
-char	*encoding_str;
+static char	*encoding_str;
-int	precision;
+static int	precision;
-int	sample_rate;
+static int	sample_rate;
-int	channels;
+static int	channels;
-struct timeval record_time;
+static struct timeval record_time;
-struct timeval start_time;
+static struct timeval start_time;
-void (*conv_func) (u_char *, int);
+static void (*conv_func) (u_char *, int);
-void usage (void);
+static void usage (void) __dead;
-int main (int, char *[]);
+static int timeleft (struct timeval *, struct timeval *);
-int timeleft (struct timeval *, struct timeval *);
+static void cleanup (int) __dead;
-void cleanup (int) __dead;
+static int write_header_sun (void **, size_t *, int *);
-int write_header_sun (void **, size_t *, int *);
+static int write_header_wav (void **, size_t *, int *);
-int write_header_wav (void **, size_t *, int *);
+static void write_header (void);
-void write_header (void);
+static void rewrite_header (void);
 void rewrite_header (void);
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char *argv[];
+{
 	u_char	*buffer;
 	size_t	len, bufsize = 0;
 	int	ch, no_time_limit = 1;
 	const char *defdevice = _PATH_SOUND;
 	while ((ch = getopt(argc, argv, "ab:B:C:F:c:d:e:fhi:m:P:p:qt:s:Vv:")) != -1) {
 		switch (ch) {
 		case 'a':
 			aflag++;
 			break;
 		case 'b':
 			decode_int(optarg, &balance);
 @@ -338,64 +335,58 @@ main(argc, argv)
 	while (no_time_limit || timeleft(&start_time, &record_time)) {
 		if ((size_t)read(audiofd, buffer, bufsize) != bufsize)
 			err(1, "read failed");
 		if (conv_func)
 			(*conv_func)(buffer, bufsize);
 		if ((size_t)write(outfd, buffer, bufsize) != bufsize)
 			err(1, "write failed");
 		total_size += bufsize;
+	}
 	cleanup(0);
+}
 int
-timeleft(start_tvp, record_tvp)
+timeleft(struct timeval *start_tvp, struct timeval *record_tvp)
 	struct timeval *start_tvp;
 	struct timeval *record_tvp;
+{
 	struct timeval now, diff;
 	(void)gettimeofday(&now, NULL);
 	timersub(&now, start_tvp, &diff);
 	timersub(record_tvp, &diff, &now);
 	return (now.tv_sec > 0 || (now.tv_sec == 0 && now.tv_usec > 0));
+}
 void
-cleanup(signo)
+cleanup(int signo)
 	int signo;
+{
 	rewrite_header();
 	close(outfd);
 	if (omonitor_gain) {
 		AUDIO_INITINFO(&info);
 		info.monitor_gain = omonitor_gain;
 		if (ioctl(audiofd, AUDIO_SETINFO, &info) < 0)
 			err(1, "failed to reset audio info");
+	}
 	close(audiofd);
 	if (signo != 0) {
 		(void)raise_default_signal(signo);
+	}
 	exit(0);
+}
-int
+static int
-write_header_sun(hdrp, lenp, leftp)
+write_header_sun(void **hdrp, size_t *lenp, int *leftp)
 	void **hdrp;
 	size_t *lenp;
 	int *leftp;
+{
 	static int warned = 0;
 	static sun_audioheader auh;
 	int sunenc, oencoding = encoding;
 	/* only perform conversions if we don't specify the encoding */
 	switch (encoding) {
 	case AUDIO_ENCODING_ULINEAR_LE:
 #if BYTE_ORDER == LITTLE_ENDIAN
 	case AUDIO_ENCODING_ULINEAR:
 #endif
 		if (precision == 16)
 			conv_func = change_sign16_swap_bytes_le;
 @@ -468,31 +459,28 @@ write_header_sun(hdrp, lenp, leftp)
 		infolen = ((len = strlen(header_info)) + 7) & 0xfffffff8;
 		*leftp = infolen - len;
 		auh.hdr_size = htonl(sizeof(auh) + infolen);
 	} else {
 		*leftp = sizeof(default_info);
 		auh.hdr_size = htonl(sizeof(auh) + *leftp);
+	}
 	*(sun_audioheader **)hdrp = &auh;
 	*lenp = sizeof auh;
 	return 0;
+}
-int
+static int
-write_header_wav(hdrp, lenp, leftp)
+write_header_wav(void **hdrp, size_t *lenp, int *leftp)
 	void **hdrp;
 	size_t *lenp;
 	int *leftp;
+{
 	/*
 	 * WAV header we write looks like this:
+	 *
 	 *      bytes   purpose
 	 *      0-3     "RIFF"
 	 *      4-7     file length (minus 8)
 	 *      8-15    "WAVEfmt "
 	 *      16-19   format size
 	 *      20-21   format tag
 	 *      22-23   number of channels
 	 *      24-27   sample rate
 	 *      28-31   average bytes per second
 @@ -699,28 +687,28 @@ fmt_pcm:
 	memcpy(p, data, 4);
 	p += 4;				/* 40/54 */
 	put32(datalen);
 	p += 4;				/* 44/58 */
 #undef put32
 #undef put16
 	*hdrp = wavheaderbuf;
 	*lenp = (p - wavheaderbuf);
 	return 0;
+}
-void
+static void
-write_header()
+write_header(void)
+{
 	struct iovec iv[3];
 	int veclen, left, tlen;
 	void *hdr;
 	size_t hdrlen;
 	switch (format) {
 	case AUDIO_FORMAT_DEFAULT:
 	case AUDIO_FORMAT_SUN:
 		if (write_header_sun(&hdr, &hdrlen, &left) != 0)
 			return;
 		break;
 	case AUDIO_FORMAT_WAV:
 @@ -749,41 +737,41 @@ write_header()
 	if (left) {
 		iv[veclen].iov_base = default_info;
 		iv[veclen].iov_len = left;
 		tlen += iv[veclen++].iov_len;
+	}
 	if (tlen == 0)
 		return;
 	if (writev(outfd, iv, veclen) != tlen)
 		err(1, "could not write audio header");
+}
-void
+static void
-rewrite_header()
+rewrite_header(void)
+{
 	/* can't do this here! */
 	if (outfd == STDOUT_FILENO)
 		return;
 	if (lseek(outfd, SEEK_SET, 0) < 0)
 		err(1, "could not seek to start of file for header rewrite");
 	write_header();
+}
-void
+static void
-usage()
+usage(void)
+{
 	fprintf(stderr, "Usage: %s [-afhqV] [options] {files ...|-}\n",
 	    getprogname());
 	fprintf(stderr, "Options:\n\t"
 	    "-B buffer size\n\t"
 	    "-b balance (0-63)\n\t"
 	    "-c channels\n\t"
 	    "-d audio device\n\t"
 	    "-e encoding\n\t"
 	    "-F format\n\t"
 	    "-i header information\n\t"
 	    "-m monitor volume\n\t"