Module Name: src Committed By: christos Date: Sun Nov 23 02:15:52 UTC 2014
Modified Files: src/sys/arch/sparc/sparc: openfirm.c Log Message: avoid shadowed variable To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/openfirm.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/sparc/sparc/openfirm.c diff -u src/sys/arch/sparc/sparc/openfirm.c:1.18 src/sys/arch/sparc/sparc/openfirm.c:1.19 --- src/sys/arch/sparc/sparc/openfirm.c:1.18 Mon Jul 18 17:00:28 2011 +++ src/sys/arch/sparc/sparc/openfirm.c Sat Nov 22 21:15:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $ */ +/* $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -554,7 +554,7 @@ OF_seek(int handle, u_quad_t pos) } void -OF_boot(const char *bootspec) +OF_boot(const char *bspec) { struct { cell_t name; @@ -564,12 +564,12 @@ OF_boot(const char *bootspec) } args; int l; - if ((l = strlen(bootspec)) >= NBPG) + if ((l = strlen(bspec)) >= NBPG) panic("OF_boot"); args.name = ADR2CELL("boot"); args.nargs = 1; args.nreturns = 0; - args.bootspec = ADR2CELL(bootspec); + args.bootspec = ADR2CELL(bspec); openfirmware(&args); panic("OF_boot failed"); }