X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/0875b58fcccadd756e11487185c2ac1d3ed8ab4d..4aee39a18184ae8595936a03ad254c27d149a0eb:/dstr.c

diff --git a/dstr.c b/dstr.c
index 7299bf6..cda48a2 100644
--- a/dstr.c
+++ b/dstr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.c,v 1.1 1998/06/17 23:44:42 mdw Exp $
+ * $Id: dstr.c,v 1.16 2004/04/08 01:36:11 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -12,26 +12,19 @@
  * This file is part of the mLib utilities library.
  *
  * mLib is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU 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: dstr.c,v $
- * Revision 1.1  1998/06/17 23:44:42  mdw
- * Initial revision
+ * 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.
  */
 
 /*----- Header files ------------------------------------------------------*/
@@ -45,7 +38,13 @@
 
 /*----- Tunable constants -------------------------------------------------*/
 
-#define DSTR_INITSZ 256			/* Initial buffer size */
+/*
+ * If the buffer is empty, it is set to @DSTR_INITSZ@ bytes in size.
+ * Otherwise, it's set to the next power of two that's large enough.  This is
+ * memory-hungry, but efficient.
+ */
+
+#define DSTR_INITSZ 64			/* Initial buffer size */
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -55,15 +54,10 @@
  *
  * Returns:	---
  *
- * Use:		Initialises a dynamic string.
+ * Use:		Initializes a dynamic string.
  */
 
-void dstr_create(dstr *d)
-{
-  d->sz = 0;
-  d->len = 0;
-  d->buf = 0;
-}
+void dstr_create(dstr *d) { DCREATE(d); }
 
 /* --- @dstr_destroy@ --- *
  *
@@ -74,28 +68,18 @@ void dstr_create(dstr *d)
  * Use:		Reclaims the space used by a dynamic string.
  */
 
-void dstr_destroy(dstr *d)
-{
-  if (d->buf)
-    free(d->buf);
-  d->buf = 0;
-  d->len = 0;
-  d->sz = 0;
-}
+void dstr_destroy(dstr *d) { DDESTROY(d); }
 
 /* --- @dstr_reset@ --- *
  *
- * Arguments:	@dstr *d@ = pointer to a dynaimc string block
+ * Arguments:	@dstr *d@ = pointer to a dynamic string block
  *
  * Returns:	---
  *
  * Use:		Resets a string so that new data gets put at the beginning.
  */
 
-void dstr_reset(dstr *d)
-{
-  d->len = 0;
-}
+void dstr_reset(dstr *d) { DRESET(d); }
 
 /* --- @dstr_ensure@ --- *
  *
@@ -118,27 +102,18 @@ void dstr_ensure(dstr *d, size_t sz)
   if (rq <= d->sz)
     return;
 
-  /* --- Grow the buffer --- *
-   *
-   * For small buffers, just double the size.  For big buffers, make them
-   * a multiple of some suitably large chunk size.
-   */
+  /* --- Grow the buffer --- */
 
   nsz = d->sz;
 
-  do {
-    if (nsz == 0)
-      nsz = DSTR_INITSZ;
-    else if (d->sz < 0x1000)
-      nsz <<= 1;
-    else
-      nsz = (rq + 0x0fff) & ~0x0fff;
-  } while (rq > nsz);
+  if (nsz == 0)
+    nsz = (DSTR_INITSZ >> 1);
+  do nsz <<= 1; while (nsz < rq);
 
   if (d->buf)
-    d->buf = xrealloc(d->buf, nsz);
+    d->buf = x_realloc(d->a, d->buf, nsz, d->sz);
   else
-    d->buf = xmalloc(nsz);
+    d->buf = x_alloc(d->a, nsz);
   d->sz = nsz;
 }
 
@@ -152,10 +127,7 @@ void dstr_ensure(dstr *d, size_t sz)
  * Use:		Appends a character to a string.
  */
 
-void dstr_putc(dstr *d, char ch)
-{
-  DPUTC(d, ch);
-}
+void dstr_putc(dstr *d, char ch) { DPUTC(d, ch); }
 
 /* --- @dstr_putz@ --- *
  *
@@ -168,10 +140,7 @@ void dstr_putc(dstr *d, char ch)
  *		by subsequent `put' operations.
  */
 
-void dstr_putz(dstr *d)
-{
-  DPUTZ(d);
-}
+void dstr_putz(dstr *d) { DPUTZ(d); }
 
 /* --- @dstr_puts@ --- *
  *
@@ -184,10 +153,7 @@ void dstr_putz(dstr *d)
  *		byte is added, as for @dstr_putz@.
  */
 
-void dstr_puts(dstr *d, const char *s)
-{
-  DPUTS(d, s);
-}
+void dstr_puts(dstr *d, const char *s) { DPUTS(d, s); }
 
 /* --- @dstr_putd@ --- *
  *
@@ -200,10 +166,7 @@ void dstr_puts(dstr *d, const char *s)
  *		byte is added, as for @dstr_putz@.
  */
 
-void dstr_putd(dstr *d, const dstr *s)
-{
-  DPUTD(d, s);
-}
+void dstr_putd(dstr *d, const dstr *s) { DPUTD(d, s); }
 
 /* --- @dstr_putm@ --- *
  *
@@ -215,10 +178,7 @@ void dstr_putd(dstr *d, const dstr *s)
  *		null is appended.
  */
 
-void dstr_putm(dstr *d, const void *p, size_t sz)
-{
-  DPUTM(d, p, sz);
-}
+void dstr_putm(dstr *d, const void *p, size_t sz) { DPUTM(d, p, sz); }
 
 /* --- @dstr_tidy@ --- *
  *
@@ -232,8 +192,8 @@ void dstr_putm(dstr *d, const void *p, size_t sz)
 
 void dstr_tidy(dstr *d)
 {
-  dstr_putz(d);
-  d->buf = xrealloc(d->buf, d->len + 1);
+  d->buf = x_realloc(d->a, d->buf, d->len + 1, d->sz);
+  d->buf[d->len] = 0;
   d->sz = d->len + 1;
 }
 
@@ -259,13 +219,6 @@ int dstr_putline(dstr *d, FILE *fp)
 
   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);
@@ -275,6 +228,14 @@ int dstr_putline(dstr *d, FILE *fp)
     if (ch == EOF && !rd)
       return (EOF);
 
+    /* --- Make sure there's some buffer space --- */
+
+    if (!left) {
+      d->len = off;
+      dstr_ensure(d, 1);
+      left = d->sz - off;
+    }
+
     /* --- End-of-file or newline ends the loop --- */
 
     if (ch == EOF || ch == '\n') {
@@ -300,9 +261,6 @@ int dstr_putline(dstr *d, FILE *fp)
  * Use:		Writes a dynamic string to a file.
  */
 
-size_t dstr_write(dstr *d, FILE *fp)
-{
-  return (fwrite(d->buf, 1, d->len, fp));
-}
+size_t dstr_write(const dstr *d, FILE *fp) { return (DWRITE(d, fp)); }
 
 /*----- That's all, folks -------------------------------------------------*/