Wed Jul 27 15:08:43 2011 UTC ()

Make atoi() use strtoll from libkern.


(njoly)

diff -r1.49 -r1.50 src/sys/arch/alpha/alpha/autoconf.c

--- src/sys/arch/alpha/alpha/autoconf.c 2011/07/26 14:59:03	1.49
+++ src/sys/arch/alpha/alpha/autoconf.c 2011/07/27 15:08:42	1.50

 @@ -1,14 +1,14 @@
-/* $NetBSD: autoconf.c,v 1.49 2011/07/26 14:59:03 njoly Exp $ */
+/* $NetBSD: autoconf.c,v 1.50 2011/07/27 15:08:42 njoly Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -32,48 +32,48 @@
  * 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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.49 2011/07/26 14:59:03 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.50 2011/07/27 15:08:42 njoly Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <dev/cons.h>
 #include <machine/autoconf.h>
 #include <machine/alpha.h>
 #include <machine/cpu.h>
 #include <machine/prom.h>
 #include <machine/cpuconf.h>
 #include <machine/intr.h>
 struct bootdev_data	*bootdev_data;
 void	parse_prom_bootdev(void);
-static int atoi(const char *);
+static inline int atoi(const char *);
 /*
  * cpu_configure:
  * called at boot time, configure all devices on system
  */
 void
 cpu_configure(void)
+{
 	parse_prom_bootdev();
 	/*
 	 * Disable interrupts during autoconfiguration.  splhigh() won't
 @@ -153,48 +153,30 @@ parse_prom_bootdev(void)
 	bd.boot_dev_type = atoi(boot_fields[6]);
 	bd.ctrl_dev_type = boot_fields[7];
 #if 0
 	printf("parsed: proto = %s, bus = %d, slot = %d, channel = %d,\n",
 	    bd.protocol, bd.bus, bd.slot, bd.channel);
 	printf("\tremote = %s, unit = %d, dev_type = %d, ctrl_type = %s\n",
 	    bd.remote_address, bd.unit, bd.boot_dev_type, bd.ctrl_dev_type);
 #endif
 	bootdev_data = &bd;
+}
-static int
+static inline int
 atoi(const char *s)
+{
-	int n, neg;
+	return (int)strtoll(s, NULL, 10);
 	n = 0;
 	neg = 0;
 	while (*s == '-') {
 		s++;
 		neg = !neg;
 	while (*s != '\0') {
 		if (*s < '0' && *s > '9')
 			break;
 		n = (10 * n) + (*s - '0');
 		s++;
 	return (neg ? -n : n);
+}
 void
 device_register(device_t dev, void *aux)
+{
 	if (bootdev_data == NULL) {
 		/*
 		 * There is no hope.
 		 */
 		return;
+	}
 	if (platform.device_register)
 		(*platform.device_register)(dev, aux);