Module Name: src
Committed By: uebayasi
Date: Sun Oct 12 15:35:40 UTC 2014
Modified Files:
src/usr.bin/config: sem.c
Log Message:
Don't shadow global 'devname' on macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/config/sem.c
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/config/sem.c
diff -u src/usr.bin/config/sem.c:1.62 src/usr.bin/config/sem.c:1.63
--- src/usr.bin/config/sem.c:1.62 Sat Oct 11 17:27:42 2014
+++ src/usr.bin/config/sem.c Sun Oct 12 15:35:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.62 2014/10/11 17:27:42 martin Exp $ */
+/* $NetBSD: sem.c,v 1.63 2014/10/12 15:35:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -142,12 +142,12 @@ finddep(struct attr *a, const char *name
}
static void
-mergedeps(const char *devname, const char *name)
+mergedeps(const char *dname, const char *name)
{
struct attr *a, *newa;
- CFGDBG(4, "merging attr `%s' to devbase `%s'", name, devname);
- a = refattr(devname);
+ CFGDBG(4, "merging attr `%s' to devbase `%s'", name, dname);
+ a = refattr(dname);
if (finddep(a, name) == NULL) {
newa = refattr(name);
a->a_deps = attrlist_cons(a->a_deps, newa);
