[src/trunk]: src/sys/arch/newsmips/newsmips avoid shadowing a new global.

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

details:   https://anonhg.NetBSD.org/src/rev/35588ddd46a9
branches:  trunk
changeset: 804107:35588ddd46a9
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 24 04:06:13 2014 +0000

description:
avoid shadowing a new global.

diffstat:

 sys/arch/newsmips/newsmips/machdep.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r edfae7f0b97e -r 35588ddd46a9 sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c      Mon Nov 24 02:36:31 2014 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c      Mon Nov 24 04:06:13 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.115 2014/03/24 20:05:20 christos Exp $   */
+/*     $NetBSD: machdep.c,v 1.116 2014/11/24 04:06:13 christos Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2014/03/24 20:05:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.116 2014/11/24 04:06:13 christos Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -196,7 +196,7 @@
 #ifdef news5000
        if (systype == NEWS5000) {
                int i;
-               char *bootspec = (char *)x_bootdev;
+               char *bspec = (char *)x_bootdev;
 
                if (bi_arg == NULL)
                        panic("news5000 requires BTINFO_BOOTARG to boot");
@@ -204,21 +204,21 @@
                _sip = (void *)bi_arg->sip;
                x_maxmem = _sip->apbsi_memsize;
                x_maxmem -= 0x00100000; /* reserve 1MB for ROM monitor */
-               if (strncmp(bootspec, "scsi", 4) == 0) {
+               if (strncmp(bspec, "scsi", 4) == 0) {
                        x_bootdev = (5 << 28) | 0;       /* magic, sd */
-                       bootspec += 4;
-                       if (*bootspec != '(' /*)*/)
+                       bspec += 4;
+                       if (*bspec != '(' /*)*/)
                                goto bootspec_end;
-                       i = strtoul(bootspec + 1, &bootspec, 10);
+                       i = strtoul(bspec + 1, &bspec, 10);
                        x_bootdev |= (i << 24);         /* bus */
-                       if (*bootspec != ',')
+                       if (*bspec != ',')
                                goto bootspec_end;
-                       i = strtoul(bootspec + 1, &bootspec, 10);
+                       i = strtoul(bspec + 1, &bspec, 10);
                        x_bootdev |= (i / 10) << 20;    /* controller */
                        x_bootdev |= (i % 10) << 16;    /* unit */
-                       if (*bootspec != ',')
+                       if (*bspec != ',')
                                goto bootspec_end;
-                       i = strtoul(bootspec + 1, &bootspec, 10);
+                       i = strtoul(bspec + 1, &bspec, 10);
                        x_bootdev |= (i << 8);          /* partition */
                }
  bootspec_end: