More sophisticated and excessive signal and alarm handling.

[mLib] / dstr.h

diff --git a/dstr.h b/dstr.h
index 3cbabc1daa6114dd384040610b0d4864691856b9..13e7d4dbeaaaf2d3a40d2527c17c0e1db6bcb4ee 100644 (file)
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.5 1999/05/13 22:47:57 mdw Exp $
+ * $Id: dstr.h,v 1.7 1999/05/21 22:12:12 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.h,v $
+ * Revision 1.7  1999/05/21 22:12:12  mdw
+ * Fix the bugs in the new macros.  (Whoops.)
+ *
+ * Revision 1.6  1999/05/21 08:38:14  mdw
+ * Add some more macros, particularly for creation and destruction.
+ *
  * Revision 1.5  1999/05/13 22:47:57  mdw
  * Misc documentation fixes.  Change `-ise' to `-ize' throughout.
  *
@@ -69,6 +75,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -78,6 +85,8 @@ typedef struct dstr {
   size_t len;                          /* Length of the string */
 } dstr;
 
+#define DSTR_INIT { 0, 0, 0 }          /* How to initialize one */
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @dstr_create@ --- *
@@ -91,6 +100,12 @@ typedef struct dstr {
 
 extern void dstr_create(dstr */*d*/);
 
+#define DCREATE(d) do {                                                        \
+  (d)->buf = 0;                                                                \
+  (d)->sz = 0;                                                         \
+  (d)->len = 0;                                                                \
+} while (0)
+
 /* --- @dstr_destroy@ --- *
  *
  * Arguments:  @dstr *d@ = pointer to a dynamic string block
@@ -102,6 +117,11 @@ extern void dstr_create(dstr */*d*/);
 
 extern void dstr_destroy(dstr */*d*/);
 
+#define DDESTROY(d) do {                                               \
+  if ((d)->buf) free((d)->buf);                                                \
+  DCREATE(d);                                                          \
+} while (0)
+
 /* --- @dstr_reset@ --- *
  *
  * Arguments:  @dstr *d@ = pointer to a dynaimc string block
@@ -113,6 +133,8 @@ extern void dstr_destroy(dstr */*d*/);
 
 extern void dstr_reset(dstr */*d*/);
 
+#define DRESET(d) ((d)->len = 0)
+
 /* --- @dstr_ensure@ --- *
  *
  * Arguments:  @dstr *d@ = pointer to a dynamic string block
@@ -292,6 +314,8 @@ extern int dstr_putline(dstr */*d*/, FILE */*fp*/);
 
 extern size_t dstr_write(const dstr */*d*/, FILE */*fp*/);
 
+#define DWRITE(d, fp) fwrite((d)->buf, 1, (d)->len, (fp))
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus