@@@ man wip

[mLib] / struct / darray.c

diff --git a/struct/darray.c b/struct/darray.c
index aa7e4a29ac933ffeca80ebd8af7b49691d65367a..0b6c2238b663e5e2349525b804168e6a05f6404d 100644 (file)
--- a/struct/darray.c
+++ b/struct/darray.c
@@ -34,6 +34,7 @@
 #include "alloc.h"
 #include "arena.h"
 #include "darray.h"
 #include "alloc.h"
 #include "arena.h"
 #include "darray.h"

+#include "growbuf.h"

 
 /*----- Magic numbers -----------------------------------------------------*/
 
 
 /*----- Magic numbers -----------------------------------------------------*/
 


@@ -111,8 +112,8 @@ void *da_ensure(da_base *b, void *v, size_t sz, size_t n)
    * two which is big enough, starting at double the current size.
    */
 
    * two which is big enough, starting at double the current size.
    */
 

-  nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
-  do nsz <<= 1; while (nsz < rq);
+  nsz = b->sz + b->off;
+  GROWBUF_SIZE(nsz, rq, DA_INITSZ, sz);

 
   /* --- Reallocate the block --- *
    *
 
   /* --- Reallocate the block --- *
    *


@@ -219,8 +220,8 @@ void *da_shunt(da_base *b, void *v, size_t sz, size_t n)
    * two which is big enough, starting at double the current size.
    */
 
    * two which is big enough, starting at double the current size.
    */
 

-  nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
-  do nsz <<= 1; while (nsz < rq);
+  nsz = b->sz + b->off;
+  GROWBUF_SIZE(nsz, rq, DA_INITSZ, sz);

 
   /* --- Reallocate the block --- *
    *
 
   /* --- Reallocate the block --- *
    *