CVS commit: [netbsd-7] src/usr.bin/audio/common

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon Jan 12 19:15:27 UTC 2015

Modified Files:
        src/usr.bin/audio/common [netbsd-7]: audio.c libaudio.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #409):
        usr.bin/audio/common/audio.c: revision 1.23
        usr.bin/audio/common/libaudio.h: revision 1.19
add a decode_uint() function.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/usr.bin/audio/common/audio.c
cvs rdiff -u -r1.18 -r1.18.4.1 src/usr.bin/audio/common/libaudio.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/audio/common/audio.c
diff -u src/usr.bin/audio/common/audio.c:1.22 src/usr.bin/audio/common/audio.c:1.22.4.1
--- src/usr.bin/audio/common/audio.c:1.22	Fri Aug 30 20:57:26 2013
+++ src/usr.bin/audio/common/audio.c	Mon Jan 12 19:15:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.22 2013/08/30 20:57:26 mrg Exp $	*/
+/*	$NetBSD: audio.c,v 1.22.4.1 2015/01/12 19:15:27 martin Exp $	*/
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: audio.c,v 1.22 2013/08/30 20:57:26 mrg Exp $");
+__RCSID("$NetBSD: audio.c,v 1.22.4.1 2015/01/12 19:15:27 martin Exp $");
 #endif
 
 
@@ -155,6 +155,21 @@ decode_int(const char *arg, int *intp)
 }
 
 void
+decode_uint(const char *arg, unsigned *intp)
+{
+	char	*ep;
+	unsigned	ret;
+
+	ret = (unsigned)strtoul(arg, &ep, 10);
+
+	if (ep[0] == '\0') {
+		*intp = ret;
+		return;
+	}
+	errx(1, "argument `%s' not a valid integer", arg);
+}
+
+void
 decode_time(const char *arg, struct timeval *tvp)
 {
 	char	*s, *colon, *dot;

Index: src/usr.bin/audio/common/libaudio.h
diff -u src/usr.bin/audio/common/libaudio.h:1.18 src/usr.bin/audio/common/libaudio.h:1.18.4.1
--- src/usr.bin/audio/common/libaudio.h:1.18	Fri Aug 30 20:57:26 2013
+++ src/usr.bin/audio/common/libaudio.h	Mon Jan 12 19:15:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: libaudio.h,v 1.18 2013/08/30 20:57:26 mrg Exp $	*/
+/*	$NetBSD: libaudio.h,v 1.18.4.1 2015/01/12 19:15:27 martin Exp $	*/
 
 /*
  * Copyright (c) 1999, 2009 Matthew R. Green
@@ -180,6 +180,7 @@ const char *audio_errstring (int);
  * generic routines?
  */
 void	decode_int (const char *, int *);
+void	decode_uint (const char *, unsigned *);
 void	decode_time (const char *, struct timeval *);
 void	decode_encoding (const char *, int *);