diff options
| -rw-r--r-- | include/ohash.h | 6 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_init.3 | 8 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_int.h | 4 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_interval.3 | 4 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_interval.c | 6 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_lookup_interval.c | 4 | ||||
| -rw-r--r-- | lib/libc/ohash/ohash_lookup_memory.c | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/include/ohash.h b/include/ohash.h index 7b40fc1c059..85cf9114c53 100644 --- a/include/ohash.h +++ b/include/ohash.h @@ -1,6 +1,6 @@ #ifndef OHASH_H #define OHASH_H -/* $OpenBSD: ohash.h,v 1.8 2005/12/29 18:54:47 jaredy Exp $ */ +/* $OpenBSD: ohash.h,v 1.9 2006/01/16 15:52:25 espie Exp $ */ /* ex:ts=8 sw=4: */ @@ -53,9 +53,9 @@ void ohash_init(struct ohash *, unsigned, struct ohash_info *); void ohash_delete(struct ohash *); unsigned int ohash_lookup_interval(struct ohash *, const char *, - const char *, u_int32_t); + const char *, uint32_t); unsigned int ohash_lookup_memory(struct ohash *, const char *, - size_t, u_int32_t) + size_t, uint32_t) __attribute__ ((__bounded__(__string__,2,3))); void *ohash_find(struct ohash *, unsigned int); void *ohash_remove(struct ohash *, unsigned int); diff --git a/lib/libc/ohash/ohash_init.3 b/lib/libc/ohash/ohash_init.3 index 1a65f8f8403..161db6d0e08 100644 --- a/lib/libc/ohash/ohash_init.3 +++ b/lib/libc/ohash/ohash_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ohash_init.3,v 1.12 2005/07/29 08:51:13 jmc Exp $ +.\" $OpenBSD: ohash_init.3,v 1.13 2006/01/16 15:52:25 espie Exp $ .\" Copyright (c) 1999 Marc Espie <espie@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -29,7 +29,7 @@ .Nm ohash_entries .Nd light-weight open hashing .Sh SYNOPSIS -.Fd #include <sys/types.h> +.Fd #include <stdint.h> .Fd #include <stddef.h> .Fd #include <ohash.h> .Ft void @@ -37,9 +37,9 @@ .Ft void .Fn ohash_delete "struct ohash *h" .Ft "unsigned int" -.Fn ohash_lookup_interval "struct ohash *h" "const char *start" "const char *end" "u_int32_t hv" +.Fn ohash_lookup_interval "struct ohash *h" "const char *start" "const char *end" "uint32_t hv" .Ft "unsigned int" -.Fn ohash_lookup_memory "struct ohash *h" "const char *k" "size_t s" "u_int32_t hv" +.Fn ohash_lookup_memory "struct ohash *h" "const char *k" "size_t s" "uint32_t hv" .Ft void * .Fn ohash_find "struct ohash *h" "unsigned int i" .Ft void * diff --git a/lib/libc/ohash/ohash_int.h b/lib/libc/ohash/ohash_int.h index 16e64fd1b46..4a3eec4b7ee 100644 --- a/lib/libc/ohash/ohash_int.h +++ b/lib/libc/ohash/ohash_int.h @@ -1,7 +1,7 @@ -/* $OpenBSD: ohash_int.h,v 1.2 2004/06/22 20:00:16 espie Exp $ */ +/* $OpenBSD: ohash_int.h,v 1.3 2006/01/16 15:52:25 espie Exp $ */ -#include <sys/types.h> #include <stddef.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include "ohash.h" diff --git a/lib/libc/ohash/ohash_interval.3 b/lib/libc/ohash/ohash_interval.3 index 0f84760e5f3..8df48c4d823 100644 --- a/lib/libc/ohash/ohash_interval.3 +++ b/lib/libc/ohash/ohash_interval.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ohash_interval.3,v 1.9 2005/02/25 03:12:43 cloder Exp $ +.\" $OpenBSD: ohash_interval.3,v 1.10 2006/01/16 15:52:25 espie Exp $ .\" Copyright (c) 2001 Marc Espie <espie@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -23,7 +23,7 @@ .Nm ohash_qlookupi .Nd helper functions for open hashing .Sh SYNOPSIS -.Fd #include <sys/types.h> +.Fd #include <stdint.h> .Fd #include <stddef.h> .Fd #include <ohash.h> .Ft u_int32_t diff --git a/lib/libc/ohash/ohash_interval.c b/lib/libc/ohash/ohash_interval.c index 93e1e0b6f01..2434d3b0561 100644 --- a/lib/libc/ohash/ohash_interval.c +++ b/lib/libc/ohash/ohash_interval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohash_interval.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */ +/* $OpenBSD: ohash_interval.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */ /* ex:ts=8 sw=4: */ @@ -19,10 +19,10 @@ #include "ohash_int.h" -u_int32_t +uint32_t ohash_interval(const char *s, const char **e) { - u_int32_t k; + uint32_t k; if (!*e) *e = s + strlen(s); diff --git a/lib/libc/ohash/ohash_lookup_interval.c b/lib/libc/ohash/ohash_lookup_interval.c index 4358b5acbbd..e49780168ba 100644 --- a/lib/libc/ohash/ohash_lookup_interval.c +++ b/lib/libc/ohash/ohash_lookup_interval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohash_lookup_interval.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */ +/* $OpenBSD: ohash_lookup_interval.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */ /* ex:ts=8 sw=4: */ @@ -21,7 +21,7 @@ unsigned int ohash_lookup_interval(struct ohash *h, const char *start, const char *end, - u_int32_t hv) + uint32_t hv) { unsigned int i, incr; unsigned int empty; diff --git a/lib/libc/ohash/ohash_lookup_memory.c b/lib/libc/ohash/ohash_lookup_memory.c index 64deb50b167..93ded5ae728 100644 --- a/lib/libc/ohash/ohash_lookup_memory.c +++ b/lib/libc/ohash/ohash_lookup_memory.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohash_lookup_memory.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */ +/* $OpenBSD: ohash_lookup_memory.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */ /* ex:ts=8 sw=4: */ @@ -20,7 +20,7 @@ #include "ohash_int.h" unsigned int -ohash_lookup_memory(struct ohash *h, const char *k, size_t size, u_int32_t hv) +ohash_lookup_memory(struct ohash *h, const char *k, size_t size, uint32_t hv) { unsigned int i, incr; unsigned int empty; |