Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / lib-lib / buffer.h

diff --git a/lib-lib/buffer.h b/lib-lib/buffer.h
index 50e3904..a0c4588 100644 (file)
--- a/lib-lib/buffer.h
+++ b/lib-lib/buffer.h
@@ -29,22 +29,10 @@
 #ifndef MUTT_LIB_LIB_BUFFER_H
 #define MUTT_LIB_LIB_BUFFER_H
 
-#include <lib-lib/str.h>
-
-/* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL          1       /* treat '=' as a special */
-#define M_TOKEN_CONDENSE       (1<<1)  /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE          (1<<2)  /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE          (1<<3)  /* don't interpret quotes */
-#define M_TOKEN_PATTERN                (1<<4)  /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT                (1<<5)  /* don't reap comments */
-#define M_TOKEN_SEMICOLON      (1<<6)  /* don't treat ; as special */
-
-
 typedef struct {
     char *data;          /* pointer to data */
     char *dptr;          /* current read/write position */
-    size_t dsize;        /* length of data */
+    ssize_t dsize;       /* length of data */
     int destroy;         /* destroy `data' when done? */
 } BUFFER;
 
@@ -52,9 +40,7 @@ BUFFER *mutt_buffer_init(BUFFER *);
 void mutt_buffer_free(BUFFER **);
 
 BUFFER *mutt_buffer_from(BUFFER *, const char *);
-int mutt_extract_token(BUFFER *, BUFFER *, int);
-
-void mutt_buffer_add(BUFFER *, const char *, size_t);
+void mutt_buffer_add(BUFFER *, const char *, ssize_t);
 static inline void mutt_buffer_addstr(BUFFER *b, const char *s) {
     mutt_buffer_add(b, s, m_strlen(s));
 }
@@ -63,4 +49,8 @@ static inline void mutt_buffer_addch(BUFFER *b, char c) {
     mutt_buffer_add(b, &c, 1);
 }
 
+static inline void mutt_buffer_reset(BUFFER *b) {
+    *(b->dptr = b->data) = '\0';
+}
+
 #endif /* MUTT_LIB_LIB_BUFFER_H */