summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2012-09-23 15:05:24 +0000
committerMarc Espie <espie@cvs.openbsd.org>2012-09-23 15:05:24 +0000
commit103aa57fddf69424b12defe84d9f0d063c1283fa (patch)
tree1b5bda23f86008b5a913a20456b015152540771b /lib
parent96e3ebb906b3f6eb2b8671c428a41c82b4a617ab (diff)
uint32_t is the integer type defined in stdint.h
u_int32_t is historical BSD stuff. fix to match the manpage, namely #include <stdint.h> as a prerequisite. okay millert@
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/ohash/ohash_int.h4
-rw-r--r--lib/libc/ohash/ohash_interval.36
-rw-r--r--lib/libc/ohash/ohash_qlookupi.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libc/ohash/ohash_int.h b/lib/libc/ohash/ohash_int.h
index 4a3eec4b7ee..6a6cbfcb956 100644
--- a/lib/libc/ohash/ohash_int.h
+++ b/lib/libc/ohash/ohash_int.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohash_int.h,v 1.3 2006/01/16 15:52:25 espie Exp $ */
+/* $OpenBSD: ohash_int.h,v 1.4 2012/09/23 15:05:23 espie Exp $ */
#include <stddef.h>
#include <stdint.h>
@@ -7,7 +7,7 @@
#include "ohash.h"
struct _ohash_record {
- u_int32_t hv;
+ uint32_t hv;
const char *p;
};
diff --git a/lib/libc/ohash/ohash_interval.3 b/lib/libc/ohash/ohash_interval.3
index c299662ae3c..28cf5b025f7 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.12 2012/06/01 02:49:07 lteo Exp $
+.\" $OpenBSD: ohash_interval.3,v 1.13 2012/09/23 15:05:23 espie Exp $
.\" Copyright (c) 2001 Marc Espie <espie@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: June 1 2012 $
+.Dd $Mdocdate: September 23 2012 $
.Dt OHASH_INTERVAL 3
.Os
.Sh NAME
@@ -26,7 +26,7 @@
.Fd #include <stdint.h>
.Fd #include <stddef.h>
.Fd #include <ohash.h>
-.Ft u_int32_t
+.Ft uint32_t
.Fn ohash_interval "const char *start" "const char **pend"
.Ft "void *"
.Fn ohash_create_entry "struct ohash_info *info" "const char *start" "const char **pend"
diff --git a/lib/libc/ohash/ohash_qlookupi.c b/lib/libc/ohash/ohash_qlookupi.c
index 2acec4e87d3..32100199031 100644
--- a/lib/libc/ohash/ohash_qlookupi.c
+++ b/lib/libc/ohash/ohash_qlookupi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohash_qlookupi.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */
+/* $OpenBSD: ohash_qlookupi.c,v 1.3 2012/09/23 15:05:23 espie Exp $ */
/* ex:ts=8 sw=4:
*/
@@ -22,7 +22,7 @@
unsigned int
ohash_qlookupi(struct ohash *h, const char *s, const char **e)
{
- u_int32_t hv;
+ uint32_t hv;
hv = ohash_interval(s, e);
return ohash_lookup_interval(h, s, *e, hv);