/* -*-c-*-
*
- * $Id: darray.c,v 1.1 1999/10/22 22:37:26 mdw Exp $
+ * $Id: darray.c,v 1.2 1999/10/28 22:05:28 mdw Exp $
*
* Dynamically growing dense arrays
*
/*----- Revision history --------------------------------------------------*
*
* $Log: darray.c,v $
+ * 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'.
*
/*----- Magic numbers -----------------------------------------------------*/
-#define DA_INITSZ 64 /* Default size for new array */
+#define DA_INITSZ 16 /* Default size for new array */
#define DA_SLOTS 8 /* Number of preshifted slots */
/*----- Main code ---------------------------------------------------------*/
/* --- Reallocate the array --- */
- nsz = v ? b->sz + b->off : DA_INITSZ;
+ nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
do nsz <<= 1; while (nsz < rq);
q = xmalloc(nsz * sz);
q += slots * sz;
/* --- Reallocate the array --- */
- nsz = v ? b->sz + b->off : DA_INITSZ;
+ nsz = v ? b->sz + b->off : (DA_INITSZ >> 1);
do nsz <<= 1; while (nsz < rq);
q = xmalloc(nsz * sz);
q += (nsz - slots) * sz;
/* -*-c-*-
*
- * $Id: dstr.c,v 1.10 1999/10/04 21:44:47 mdw Exp $
+ * $Id: dstr.c,v 1.11 1999/10/28 22:05:29 mdw Exp $
*
* Handle dynamically growing strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dstr.c,v $
+ * Revision 1.11 1999/10/28 22:05:29 mdw
+ * Modify and debug allocation routines.
+ *
* Revision 1.10 1999/10/04 21:44:47 mdw
* Move `dstr_putf' and `dstr_vputf' into a separate source file.
*
* memory-hungry, but efficient.
*/
-#define DSTR_INITSZ 256 /* Initial buffer size */
+#define DSTR_INITSZ 64 /* Initial buffer size */
/*----- Main code ---------------------------------------------------------*/
nsz = d->sz;
- if (nsz == 0 && rq < DSTR_INITSZ)
- nsz = DSTR_INITSZ;
- else
- do nsz <<= 1; while (nsz < rq);
+ if (nsz == 0)
+ nsz = (DSTR_INITSZ >> 1);
+ do nsz <<= 1; while (nsz < rq);
if (d->buf)
d->buf = xrealloc(d->buf, nsz);
void dstr_tidy(dstr *d)
{
- dstr_putz(d);
d->buf = xrealloc(d->buf, d->len + 1);
+ d->buf[d->len] = 0;
d->sz = d->len + 1;
}
for (;;) {
- /* --- Make sure there's some buffer space --- */
-
- if (!left) {
- dstr_ensure(d, 1);
- left = d->sz - off;
- }
-
/* --- Read the next byte --- */
ch = getc(fp);
if (ch == EOF && !rd)
return (EOF);
+ /* --- Make sure there's some buffer space --- */
+
+ if (!left) {
+ dstr_ensure(d, 1);
+ left = d->sz - off;
+ }
+
/* --- End-of-file or newline ends the loop --- */
if (ch == EOF || ch == '\n') {