Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/db/mpool/mpool.c,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/db/mpool/mpool.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- src/lib/libc/db/mpool/mpool.c 1993/08/26 00:43:53 1.3 +++ src/lib/libc/db/mpool/mpool.c 1994/08/18 00:41:52 1.4 @@ -32,8 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)mpool.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: mpool.c,v 1.3 1993/08/26 00:43:53 jtc Exp $"; +static char sccsid[] = "@(#)mpool.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ #include @@ -90,7 +89,7 @@ mpool_open(key, fd, pagesize, maxcache) return (NULL); } - if ((mp = malloc(sizeof(MPOOL))) == NULL) + if ((mp = (MPOOL *)malloc(sizeof(MPOOL))) == NULL) return (NULL); mp->free.cnext = mp->free.cprev = (BKT *)&mp->free; mp->lru.cnext = mp->lru.cprev = (BKT *)&mp->lru; @@ -374,7 +373,7 @@ mpool_bkt(mp) return (b); } -new: if ((b = malloc(sizeof(BKT) + mp->pagesize)) == NULL) +new: if ((b = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL) return (NULL); #ifdef STATISTICS ++mp->pagealloc;