From 0fcbeb515df8d1e45ccfbdace5b45653846c747f Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Thu, 22 Jan 2004 21:48:03 +0000 Subject: Remove unnecessary typedef usage. u_char -> unsigned char u_short -> unsigned short u_long -> unsigned long u_int -> unsigned int okay millert@ --- include/mpool.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'include/mpool.h') diff --git a/include/mpool.h b/include/mpool.h index 4ec96f965de..fb33d4493de 100644 --- a/include/mpool.h +++ b/include/mpool.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpool.h,v 1.9 2003/06/02 19:34:12 millert Exp $ */ +/* $OpenBSD: mpool.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $ */ /*- @@ -67,7 +67,7 @@ typedef struct MPOOL { pgno_t curcache; /* current number of cached pages */ pgno_t maxcache; /* max number of cached pages */ pgno_t npages; /* number of pages in the file */ - u_long pagesize; /* file page size */ + unsigned long pagesize; /* file page size */ int fd; /* file descriptor */ /* page in conversion routine */ void (*pgin)(void *, pgno_t, void *); @@ -75,15 +75,15 @@ typedef struct MPOOL { void (*pgout)(void *, pgno_t, void *); void *pgcookie; /* cookie for page in/out routines */ #ifdef STATISTICS - u_long cachehit; - u_long cachemiss; - u_long pagealloc; - u_long pageflush; - u_long pageget; - u_long pagenew; - u_long pageput; - u_long pageread; - u_long pagewrite; + unsigned long cachehit; + unsigned long cachemiss; + unsigned long pagealloc; + unsigned long pageflush; + unsigned long pageget; + unsigned long pagenew; + unsigned long pageput; + unsigned long pageread; + unsigned long pagewrite; #endif } MPOOL; @@ -97,10 +97,10 @@ __BEGIN_DECLS MPOOL *mpool_open(void *, int, pgno_t, pgno_t); void mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *), void (*)(void *, pgno_t, void *), void *); -void *mpool_new(MPOOL *, pgno_t *, u_int); -void *mpool_get(MPOOL *, pgno_t, u_int); +void *mpool_new(MPOOL *, pgno_t *, unsigned int); +void *mpool_get(MPOOL *, pgno_t, unsigned int); int mpool_delete(MPOOL *, void *); -int mpool_put(MPOOL *, void *, u_int); +int mpool_put(MPOOL *, void *, unsigned int); int mpool_sync(MPOOL *); int mpool_close(MPOOL *); #ifdef STATISTICS -- cgit v1.2.3