BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / mpool / mpool.c

diff --git a/usr/src/lib/libc/db/mpool/mpool.c b/usr/src/lib/libc/db/mpool/mpool.c
index d14c02a..72627bd 100644 (file)
--- a/usr/src/lib/libc/db/mpool/mpool.c
+++ b/usr/src/lib/libc/db/mpool/mpool.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)mpool.c    8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)mpool.c    8.2 (Berkeley) 2/21/94";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>


@@ -63,7 +89,7 @@ mpool_open(key, fd, pagesize, maxcache)
                return (NULL);
        }
 
                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;
                return (NULL);
        mp->free.cnext = mp->free.cprev = (BKT *)&mp->free;
        mp->lru.cnext = mp->lru.cprev = (BKT *)&mp->lru;


@@ -347,7 +373,7 @@ mpool_bkt(mp)
                        return (b);
                }
 
                        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;
                return (NULL);
 #ifdef STATISTICS
        ++mp->pagealloc;