X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/20eb516fdebd2fb901e6a09ffa7e741cfb8e3a83..8656dc507aee9c5dcb3a6ad876565f5fcac425ae:/darray.c diff --git a/darray.c b/darray.c index 9e3eb90..f376ee5 100644 --- a/darray.c +++ b/darray.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: darray.c,v 1.5 2000/06/17 10:37:39 mdw Exp $ + * $Id: darray.c,v 1.7 2004/04/08 01:36:11 mdw Exp $ * * Dynamically growing dense arrays * @@ -27,26 +27,6 @@ * MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: darray.c,v $ - * Revision 1.5 2000/06/17 10:37:39 mdw - * Add support for arena management. - * - * Revision 1.4 1999/11/06 12:40:45 mdw - * Minor changes to allocation strategy. - * - * Revision 1.3 1999/10/29 22:59:22 mdw - * New array adjustment macros for unsigned arguments. - * - * Revision 1.2 1999/10/28 22:05:28 mdw - * Modify and debug allocation routines. - * - * Revision 1.1 1999/10/22 22:37:26 mdw - * New dynamic array implementation replaces `dynarray.h'. - * - */ - /*----- Header files ------------------------------------------------------*/ #include @@ -144,7 +124,7 @@ void *da_ensure(da_base *b, void *v, size_t sz, size_t n) */ if (p && slots == b->off) { - q = x_realloc(b->a, p - b->off * sz, nsz * sz); + q = x_realloc(b->a, p - b->off * sz, nsz * sz, b->sz + b->off); q += slots * sz; } else { q = x_alloc(b->a, nsz * sz);