Various manual fixes.

[mLib] / arena.c

diff --git a/arena.c b/arena.c
index 20d286c00320b8080b13736ca6e9233367422393..961658734bb8defc85d59efd141637d729528598 100644 (file)
--- a/arena.c
+++ b/arena.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: arena.c,v 1.1 2000/06/17 10:37:53 mdw Exp $
+ * $Id: arena.c,v 1.5 2004/04/08 01:36:11 mdw Exp $
  *
  * Abstraction for memory allocation arenas
  *
@@ -27,25 +27,19 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: arena.c,v $
- * Revision 1.1  2000/06/17 10:37:53  mdw
- * Basic arena management.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "arena.h"
 
 /*----- The standard arena ------------------------------------------------*/
 
 static void *_alloc(arena *a, size_t sz) { return malloc(sz); }
-static void *_realloc(arena *a, void *p, size_t sz){ return realloc(p, sz); }
-static void _free(arena *a, void *p) { free (p); }
+static void *_realloc(arena *a, void *p, size_t sz, size_t osz) 
+  { return realloc(p, sz); }
+static void _free(arena *a, void *p) { free(p); }
 
 static arena_ops stdlib_ops = { _alloc, _realloc, _free, 0 };
 arena arena_stdlib = { &stdlib_ops };
@@ -61,6 +55,7 @@ arena *arena_global = &arena_stdlib;
  * Arguments:  @arena *a@ = pointer to arena block
  *             @void *p@ = pointer to memory block to resize
  *             @size_t sz@ = size desired for the block
+ *             @size_t osz@ = size of the old block
  *
  * Returns:    ---
  *
@@ -68,12 +63,12 @@ arena *arena_global = &arena_stdlib;
  *             support @realloc@ properly.
  */
 
-void *arena_fakerealloc(arena *a, void *p, size_t sz)
+void *arena_fakerealloc(arena *a, void *p, size_t sz, size_t osz)
 {
   void *q = A_ALLOC(a, sz);
   if (!q)
     return (0);
-  memcpy(q, p, sz);
+  memcpy(q, p, sz > osz ? osz : sz);
   A_FREE(a, p);
   return (q);
 }
@@ -81,7 +76,8 @@ void *arena_fakerealloc(arena *a, void *p, size_t sz)
 /* --- Function equivalents of the macros --- */
 
 void *a_alloc(arena *a, size_t sz) { return (A_ALLOC(a, sz)); }
-void *a_realloc(arena *a, void *p, size_t sz) { return A_REALLOC(a, p, sz); }
+void *a_realloc(arena *a, void *p, size_t sz, size_t osz)
+{ return A_REALLOC(a, p, sz, osz); }
 void a_free(arena *a, void *p) { A_FREE(a, p); }
 
 /*----- That's all, folks -------------------------------------------------*/