Module Name: src
Committed By: christos
Date: Mon Nov 24 04:06:13 UTC 2014
Modified Files:
src/sys/arch/newsmips/newsmips: machdep.c
Log Message:
avoid shadowing a new global.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/newsmips/newsmips/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.115 src/sys/arch/newsmips/newsmips/machdep.c:1.116
--- src/sys/arch/newsmips/newsmips/machdep.c:1.115 Mon Mar 24 16:05:20 2014
+++ src/sys/arch/newsmips/newsmips/machdep.c Sun Nov 23 23:06:13 2014
@@ -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 @@ mach_init(int x_boothowto, int x_bootdev
#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 @@ mach_init(int x_boothowto, int x_bootdev
_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:
