| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: sem.c,v 1.62 2014/10/11 17:27:42 martin Exp $ */ | | 1 | /* $NetBSD: sem.c,v 1.63 2014/10/12 15:35:40 uebayasi Exp $ */ |
| 2 | | | 2 | |
| 3 | /* | | 3 | /* |
| 4 | * Copyright (c) 1992, 1993 | | 4 | * Copyright (c) 1992, 1993 |
| 5 | * The Regents of the University of California. All rights reserved. | | 5 | * The Regents of the University of California. All rights reserved. |
| 6 | * | | 6 | * |
| 7 | * This software was developed by the Computer Systems Engineering group | | 7 | * This software was developed by the Computer Systems Engineering group |
| 8 | * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and | | 8 | * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and |
| 9 | * contributed to Berkeley. | | 9 | * contributed to Berkeley. |
| 10 | * | | 10 | * |
| 11 | * All advertising materials mentioning features or use of this software | | 11 | * All advertising materials mentioning features or use of this software |
| 12 | * must display the following acknowledgement: | | 12 | * must display the following acknowledgement: |
| 13 | * This product includes software developed by the University of | | 13 | * This product includes software developed by the University of |
| 14 | * California, Lawrence Berkeley Laboratories. | | 14 | * California, Lawrence Berkeley Laboratories. |
| @@ -132,32 +132,32 @@ static struct attr * | | | @@ -132,32 +132,32 @@ static struct attr * |
| 132 | finddep(struct attr *a, const char *name) | | 132 | finddep(struct attr *a, const char *name) |
| 133 | { | | 133 | { |
| 134 | struct attrlist *al; | | 134 | struct attrlist *al; |
| 135 | | | 135 | |
| 136 | for (al = a->a_deps; al != NULL; al = al->al_next) { | | 136 | for (al = a->a_deps; al != NULL; al = al->al_next) { |
| 137 | struct attr *this = al->al_this; | | 137 | struct attr *this = al->al_this; |
| 138 | if (strcmp(this->a_name, name) == 0) | | 138 | if (strcmp(this->a_name, name) == 0) |
| 139 | return this; | | 139 | return this; |
| 140 | } | | 140 | } |
| 141 | return NULL; | | 141 | return NULL; |
| 142 | } | | 142 | } |
| 143 | | | 143 | |
| 144 | static void | | 144 | static void |
| 145 | mergedeps(const char *devname, const char *name) | | 145 | mergedeps(const char *dname, const char *name) |
| 146 | { | | 146 | { |
| 147 | struct attr *a, *newa; | | 147 | struct attr *a, *newa; |
| 148 | | | 148 | |
| 149 | CFGDBG(4, "merging attr `%s' to devbase `%s'", name, devname); | | 149 | CFGDBG(4, "merging attr `%s' to devbase `%s'", name, dname); |
| 150 | a = refattr(devname); | | 150 | a = refattr(dname); |
| 151 | if (finddep(a, name) == NULL) { | | 151 | if (finddep(a, name) == NULL) { |
| 152 | newa = refattr(name); | | 152 | newa = refattr(name); |
| 153 | a->a_deps = attrlist_cons(a->a_deps, newa); | | 153 | a->a_deps = attrlist_cons(a->a_deps, newa); |
| 154 | CFGDBG(3, "attr `%s' merged to attr `%s'", newa->a_name, | | 154 | CFGDBG(3, "attr `%s' merged to attr `%s'", newa->a_name, |
| 155 | a->a_name); | | 155 | a->a_name); |
| 156 | } | | 156 | } |
| 157 | } | | 157 | } |
| 158 | | | 158 | |
| 159 | static void | | 159 | static void |
| 160 | fixdev(struct devbase *dev) | | 160 | fixdev(struct devbase *dev) |
| 161 | { | | 161 | { |
| 162 | struct attrlist *al; | | 162 | struct attrlist *al; |
| 163 | struct attr *devattr, *a; | | 163 | struct attr *devattr, *a; |