@@@ timeout wip

[mLib] / struct / buf-dstr.c

diff --git a/struct/buf-dstr.c b/struct/buf-dstr.c
index 2d91b42ed92aa1ebbf550f6c4d1e9b261752e612..18f98f39d47d8d82c92249c71fe457498f82f6de 100644 (file)
--- a/struct/buf-dstr.c
+++ b/struct/buf-dstr.c
@@ -33,9 +33,9 @@
 
 /*----- Main code ---------------------------------------------------------*/
 
 
 /*----- Main code ---------------------------------------------------------*/
 

-/* --- @buf_getdstr{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_getdstr{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @dstr *d@ = where to put the result
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @dstr *d@ = where to put the result
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -54,12 +54,14 @@
       return (-1);                                                     \
     DPUTM(d, p, sz);                                                   \
     return (0);                                                                \
       return (-1);                                                     \
     DPUTM(d, p, sz);                                                   \
     return (0);                                                                \

-  }
+  }                                                                    \
+  int (dbuf_getdstr##w)(dbuf *db, dstr *d)                             \
+    { return (dbuf_getdstr##w(db, d)); }

 BUF_DOSUFFIXES(BUF_GETDSTR_)
 
 BUF_DOSUFFIXES(BUF_GETDSTR_)
 

-/* --- @buf_putdstr{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_putdstr{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @dstr *d@ = string to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @dstr *d@ = string to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -69,7 +71,9 @@ BUF_DOSUFFIXES(BUF_GETDSTR_)
 
 #define BUF_PUTDSTR_(n, W, w)                                          \
   int buf_putdstr##w(buf *b, dstr *d)                                  \
 
 #define BUF_PUTDSTR_(n, W, w)                                          \
   int buf_putdstr##w(buf *b, dstr *d)                                  \

-    { return (buf_putmem##w(b, d->buf, d->len)); }
+    { return (buf_putmem##w(b, d->buf, d->len)); }                     \
+  int (dbuf_putdstr##w)(dbuf *db, dstr *d)                             \
+    { return (dbuf_putdstr##w(db, d)); }

 BUF_DOSUFFIXES(BUF_PUTDSTR_)
 
 /*----- That's all, folks -------------------------------------------------*/
 BUF_DOSUFFIXES(BUF_PUTDSTR_)
 
 /*----- That's all, folks -------------------------------------------------*/