diff options
author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-15 01:47:15 +0000 |
---|---|---|
committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-11-15 01:47:15 +0000 |
commit | 44109e55e5322b180879bc602fd12d59ab996a5f (patch) | |
tree | 41ddcf0fd65e7a0ef0e12ec5f24146bf61cafc6f /usr.sbin/config | |
parent | 92642bbb1f65666ec4372bc7874e350e2304679f (diff) |
Fix bug introduced with overriding of pseudo-devices.
Diffstat (limited to 'usr.sbin/config')
-rw-r--r-- | usr.sbin/config/hash.c | 8 | ||||
-rw-r--r-- | usr.sbin/config/sem.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/config/hash.c b/usr.sbin/config/hash.c index 735213d0dc8..a03ac789155 100644 --- a/usr.sbin/config/hash.c +++ b/usr.sbin/config/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.7 2000/01/04 14:23:43 angelos Exp $ */ +/* $OpenBSD: hash.c,v 1.8 2000/11/15 01:47:13 angelos Exp $ */ /* $NetBSD: hash.c,v 1.4 1996/11/07 22:59:43 gwr Exp $ */ /* @@ -264,7 +264,7 @@ ht_remove(ht, nam) hp = ht->ht_tab[h & ht->ht_mask]; while (hp && hp->h_name == nam) { ht->ht_tab[h & ht->ht_mask] = hp->h_next; - /* XXX Free hp ? */ + /* XXX free hp ? */ hp = ht->ht_tab[h & ht->ht_mask]; } @@ -272,9 +272,9 @@ ht_remove(ht, nam) return (0); for (thp = hp->h_next; thp != NULL; thp = hp->h_next) { - if (thp->h_name == nam) { + if (thp->h_name == nam) { hp->h_next = thp->h_next; - /* XXX Free hp ? */ + /* XXX free thp ? */ } else hp = thp; } diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c index 5bbd53a9feb..e4859f78528 100644 --- a/usr.sbin/config/sem.c +++ b/usr.sbin/config/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.17 2000/10/28 21:51:38 angelos Exp $ */ +/* $OpenBSD: sem.c,v 1.18 2000/11/15 01:47:14 angelos Exp $ */ /* $NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $ */ /* @@ -894,8 +894,8 @@ addpseudo(name, number) } if (ht_lookup(devitab, name) != NULL) { warnx("warning: duplicate definition of `%s', will use latest definition", name); - ht_remove(devitab, name); - d->d_umax = 0; + d->d_umax = number; + return; } i = newdevi(name, number - 1, d); /* foo 16 => "foo0..foo15" */ if (ht_insert(devitab, name, i)) |