X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=state.c;h=2f0c8f7bfd1c10b3eb0c810a6a6950e6f16b5d6e;hp=4d4c19ae150845522322a08632e6992cf8f7d889;hb=0dbe922d4298aed78dcba64b7c770f315a64505e;hpb=40fc05e11b8f95a9661e6e410a9e7b7da7824891

diff --git a/state.c b/state.c
index 4d4c19a..2f0c8f7 100644
--- a/state.c
+++ b/state.c
@@ -12,12 +12,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
 
-#include <lib-lib/debug.h>
+#include <lib-mime/rfc3676.h>
 
 #include "mutt.h"
 #include "state.h"
-#include "rfc3676.h"
 
 static void state_prefix_put (const char *d, ssize_t dlen, STATE * s)
 {
@@ -36,7 +36,7 @@ void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
   ssize_t ibl, obl;
 
   if (!bufi) {
-    if (cd != (iconv_t) (-1)) {
+    if (cd != MUTT_ICONV_ERROR) {
       ob = bufo, obl = sizeof (bufo);
       my_iconv(cd, 0, 0, &ob, &obl);
       if (ob != bufo)
@@ -47,7 +47,7 @@ void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
     return;
   }
 
-  if (cd == (iconv_t) (-1)) {
+  if (cd == MUTT_ICONV_ERROR) {
     state_prefix_put (bufi, *l, s);
     *l = 0;
     return;
@@ -77,9 +77,6 @@ void state_prefix_putc (char c, STATE * s)
       char buf[2 * SHORT_STRING];
       int j = 0, offset = 0;
       regmatch_t pmatch[1];
-#ifdef DEBUG
-      unsigned char save = '\0';
-#endif
 
       state_reset_prefix (s);
       while (regexec
@@ -101,15 +98,6 @@ void state_prefix_putc (char c, STATE * s)
       else
         snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf);
 
-#ifdef DEBUG
-      if (m_strlen(buf) >= 2) {
-        save = buf[m_strlen(buf) - 1];
-        buf[m_strlen(buf) - 1] = '\0';
-        debug_print (2, ("buf = '%s'\n", buf));
-        buf[m_strlen(buf)] = save;
-      }
-#endif
-
       state_puts (buf, s);
     }
   }