Rearrange timeout handling to avoid list corruptions.

[mLib] / dstr.h

diff --git a/dstr.h b/dstr.h
index 3ef27ea01df2de0de709f4f99c678b89a0d4f1d1..6bc33f89dcea6fec00a938c3aa78192c7ef7ddaa 100644 (file)
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.8 1999/07/14 19:45:24 mdw Exp $
+ * $Id: dstr.h,v 1.10 1999/12/22 15:39:51 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.h,v $
+ * Revision 1.10  1999/12/22 15:39:51  mdw
+ * Fix argument reuse in DPUTS.
+ *
+ * Revision 1.9  1999/12/10 23:42:04  mdw
+ * Change header file guard names.
+ *
  * Revision 1.8  1999/07/14 19:45:24  mdw
  * Prevent some macros from re-evaluating their arguments.
  *
@@ -57,8 +63,8 @@
  *
  */
 
-#ifndef DSTR_H
-#define DSTR_H
+#ifndef MLIB_DSTR_H
+#define MLIB_DSTR_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -130,7 +136,7 @@ extern void dstr_destroy(dstr */*d*/);
 
 /* --- @dstr_reset@ --- *
  *
- * Arguments:  @dstr *d@ = pointer to a dynaimc string block
+ * Arguments:  @dstr *d@ = pointer to a dynamic string block
  *
  * Returns:    ---
  *
@@ -213,7 +219,7 @@ extern void dstr_puts(dstr */*d*/, const char */*s*/);
 #define DPUTS(d, s) do {                                               \
   dstr *_d = (d);                                                      \
   const char *_s = (s);                                                        \
-  size_t _sz = strlen(s);                                              \
+  size_t _sz = strlen(_s);                                             \
   DENSURE(_d, _sz + 1);                                                        \
   memcpy(_d->buf + _d->len, _s, _sz + 1);                              \
   _d->len += _sz;                                                      \