--- ray/src/common/malloc.c	2003/02/22 02:07:22	2.12
+++ ray/src/common/malloc.c	2003/06/30 14:59:11	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: malloc.c,v 2.12 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: malloc.c,v 2.16 2003/06/30 14:59:11 schorsch Exp $";
 #endif
 /*
  * Fast malloc for memory hogs and VM environments.
@@ -19,69 +19,11 @@ static const char	RCSid[] = "$Id: malloc.c,v 2.12 2003
  *	Greg Ward	Lawrence Berkeley Laboratory
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * 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. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 Lawrence Berkeley National Laboratory OR
- * ITS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  <errno.h>
+#include  <string.h>
 
-#ifndef  BSD
-#define  bcopy(s,d,n)		(void)memcpy(d,s,n)
-#define  bzero(d,n)		(void)memset(d,0,n)
-#endif
 
 #ifdef MSTATS
 #include  <stdio.h>
@@ -237,9 +179,9 @@ unsigned	*np;
 		cptab.ptr = big->ptr;
 		cptab.siz = big->siz;
 		big->siz = 0;			/* clear and copy */
-		bcopy((char *)tab, (char *)(mtab(&cptab)+1),
+		memcpy((char *)(mtab(&cptab)+1), (char *)tab,
 				tablen*sizeof(struct mblk));
-		bzero((char *)(mtab(&cptab)+tablen+1),
+		memset((char *)(mtab(&cptab)+tablen+1), '\0',
 			(mtablen(&cptab)-tablen-1)*sizeof(struct mblk));
 	}			/* next round */
 }
@@ -439,7 +381,7 @@ unsigned	n;
 	if ((p = malloc(n)) == NULL)
 		return(n<=on ? op : NULL);
 	if (on) {
-		bcopy(op, p, n>on ? on : n);
+		memcpy(p, op, n>on ? on : n);
 		free(op);
 	}
 	return(p);