begin to rework mailcap parsing a "bit".

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

diff --git a/lib-lib/buffer.c b/lib-lib/buffer.c
index 47e58ba..0a506bb 100644 (file)
--- a/lib-lib/buffer.c
+++ b/lib-lib/buffer.c
@@ -36,8 +36,6 @@
 #include "buffer.h"
 #include "file.h"
 
-#include "lib/debug.h"
-
 #include "mutt.h"
 
 /*
@@ -88,7 +86,7 @@ void mutt_buffer_free(BUFFER **p)
 /* dynamically grows a BUFFER to accomodate s, in increments of 128 bytes.
  * Always one byte bigger than necessary for the null terminator, and
  * the buffer is always null-terminated */
-void mutt_buffer_add(BUFFER *buf, const char *s, size_t len)
+void mutt_buffer_add(BUFFER *buf, const char *s, ssize_t len)
 {
     size_t offset;
 
@@ -195,7 +193,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             FILE *fp;
             pid_t pid;
             char *cmd, *ptr;
-            size_t expnlen;
+            ssize_t expnlen;
             BUFFER expn;
             int line = 0;
 
@@ -208,13 +206,11 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
                 }
             } while (pc && *pc != '`');
             if (!pc) {
-                debug_print (1, ("mismatched backtics\n"));
                 return (-1);
             }
 
             cmd = p_dupstr(tok->dptr, pc - tok->dptr);
             if ((pid = mutt_create_filter(cmd, NULL, &fp, NULL)) < 0) {
-                debug_print(1, ("unable to fork command: %s\n", cmd));
                 p_delete(&cmd);
                 return -1;
             }