/* -*-c-*-
*
- * $Id: dstr.c,v 1.3 1999/05/05 18:50:31 mdw Exp $
+ * $Id: dstr.c,v 1.9 1999/07/06 19:16:06 mdw Exp $
*
* Handle dynamically growing strings
*
* 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.
+ * 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.9 1999/07/06 19:16:06 mdw
+ * Simplify buffer-growing algorithm. Just double it each time.
+ *
+ * Revision 1.8 1999/06/01 09:47:52 mdw
+ * Fix nasty bugs in `dstr_vputf'.
+ *
+ * Revision 1.7 1999/05/21 22:14:30 mdw
+ * Take advantage of the new dynamic string macros.
+ *
+ * Revision 1.6 1999/05/21 08:38:33 mdw
+ * Implement some more functions in terms of macros.
+ *
+ * Revision 1.5 1999/05/13 22:47:57 mdw
+ * Misc documentation fixes. Change `-ise' to `-ize' throughout.
+ *
+ * Revision 1.4 1999/05/06 19:51:35 mdw
+ * Reformatted the LGPL notice a little bit.
+ *
* Revision 1.3 1999/05/05 18:50:31 mdw
* Change licensing conditions to LGPL.
*
/*----- Tunable constants -------------------------------------------------*/
+/* --- Buffer expansion parameters --- *
+ *
+ * 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 256 /* Initial buffer size */
-#define DSTR_INCSZ 4096 /* Threshhold for doubling */
+
+/* --- Parameters for @dstr_putf@ --- *
+ *
+ * For each format specifier, at least @DSTR_PUTFSTEP@ bytes are ensured
+ * before writing the formatted result.
+ */
+
#define DSTR_PUTFSTEP 64 /* Buffer size for @putf@ */
/*----- Main code ---------------------------------------------------------*/
*
* 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@ --- *
*
* 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@ --- *
*
* 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@ --- *
*
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 && rq < DSTR_INITSZ)
+ nsz = DSTR_INITSZ;
+ else
+ do nsz <<= 1; while (nsz < rq);
if (d->buf)
d->buf = xrealloc(d->buf, nsz);
* 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@ --- *
*
* by subsequent `put' operations.
*/
-void dstr_putz(dstr *d)
-{
- DPUTZ(d);
-}
+void dstr_putz(dstr *d) { DPUTZ(d); }
/* --- @dstr_puts@ --- *
*
* 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_vputf@ --- *
*
* @const char *p@ = pointer to @printf@-style format string
* @va_list ap@ = argument handle
*
- * Returns: ---
+ * Returns: The number of characters written to the string.
*
* Use: As for @dstr_putf@, but may be used as a back-end to user-
* supplied functions with @printf@-style interfaces.
const char *q = p;
size_t n = d->len;
size_t sz;
+ dstr dd = DSTR_INIT;
while (*p) {
unsigned f;
int wd, prec;
- dstr dd;
enum {
f_short = 1,
/* --- Sort out the various silly flags and things --- */
- dstr_create(&dd);
DPUTC(&dd, '%');
f = 0;
sz = DSTR_PUTFSTEP;
goto getnum;
default:
if (isdigit((unsigned char)*p)) {
- f |= f_prec;
+ f |= f_wd;
ip = &wd;
goto getnum;
}
DENSURE(&dd, DSTR_PUTFSTEP);
dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
} else {
- *ip = *p + '0';
+ *ip = *p - '0';
DPUTC(&dd, *p);
p++;
while (isdigit((unsigned char)*p)) {
DPUTC(&dd, *p);
- *ip = 10 * *ip + *p++ + '0';
+ *ip = 10 * *ip + *p++ - '0';
}
}
break;
}
formatted:
- dstr_destroy(&dd);
+ DRESET(&dd);
q = ++p;
}
DPUTM(d, q, p - q);
finished:
DPUTZ(d);
+ DDESTROY(&dd);
return (d->len - n);
}
* @const char *p@ = pointer to @printf@-style format string
* @...@ = argument handle
*
- * Returns: ---
+ * Returns: The number of characters written to the string.
*
* Use: Writes a piece of text to a dynamic string, doing @printf@-
* style substitutions as it goes. Intended to be robust if
* 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@ --- *
*
* 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@ --- *
*
* 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 -------------------------------------------------*/
~mdw / mLib / blobdiff