Build: Overhaul build system.

[mLib] / darray.c

diff --git a/darray.c b/darray.c
index 9e3eb905160bb3aa66f60798c76257d37aeebbcc..05ba81e44857aeac7e8d1679ced700b24a57a5ed 100644 (file)
--- a/darray.c
+++ b/darray.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
 /* -*-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
  *
  * (c) 1999 Straylight/Edgeware
  */
 
  *
  * Dynamically growing dense arrays
  *
  * (c) 1999 Straylight/Edgeware
  */
 

-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*

  *
  * This file is part of the mLib utilities library.
  *
  *
  * This file is part of the mLib utilities library.
  *


@@ -15,38 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.

- * 
+ *

  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.

- * 
+ *

  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * 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 <stdio.h>
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdio.h>


@@ -144,7 +124,7 @@ void *da_ensure(da_base *b, void *v, size_t sz, size_t n)
    */
 
   if (p && slots == b->off) {
    */
 
   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);
     q += slots * sz;
   } else {
     q = x_alloc(b->a, nsz * sz);


@@ -258,7 +238,7 @@ void *da_shunt(da_base *b, void *v, size_t sz, size_t n)
   }
 
   /* --- Fill in the other parts of the base structure --- */
   }
 
   /* --- Fill in the other parts of the base structure --- */

-  
+

   b->off = nsz - slots;
   b->sz = slots;
   b->unshift = b->push = 0;
   b->off = nsz - slots;
   b->sz = slots;
   b->unshift = b->push = 0;