X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=state.c;h=656f816235f7a4136628942ae7189ef6b16939a9;hp=7b4438956c32a53d28a3b50542316b35565f60c6;hb=2b2f17c2b838911949a6e8665ef3131382099a62;hpb=e5c944e193f275241f3c709d952387db9073f279

diff --git a/state.c b/state.c
index 7b44389..656f816 100644
--- a/state.c
+++ b/state.c
@@ -31,14 +31,14 @@ static void state_prefix_put (const char *d, size_t dlen, STATE * s)
 void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s)
 {
   char bufo[BUFO_SIZE];
-  ICONV_CONST char *ib;
+  const char *ib;
   char *ob;
   size_t ibl, obl;
 
   if (!bufi) {
     if (cd != (iconv_t) (-1)) {
       ob = bufo, obl = sizeof (bufo);
-      iconv (cd, 0, 0, &ob, &obl);
+      my_iconv(cd, 0, 0, &ob, &obl);
       if (ob != bufo)
         state_prefix_put (bufo, ob - bufo, s);
     }
@@ -70,7 +70,7 @@ void state_prefix_putc (char c, STATE * s)
   if (s->flags & M_PENDINGPREFIX) {
     int i;
 
-    i = str_len (Quotebuf);
+    i = m_strlen(Quotebuf);
     Quotebuf[i++] = c;
     Quotebuf[i] = '\0';
     if (i == sizeof (Quotebuf) - 1 || c == '\n') {
@@ -102,11 +102,11 @@ void state_prefix_putc (char c, STATE * s)
         snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf);
 
 #ifdef DEBUG
-      if (str_len (buf) >= 2) {
-        save = buf[str_len (buf) - 1];
-        buf[str_len (buf) - 1] = '\0';
+      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[str_len (buf)] = save;
+        buf[m_strlen(buf)] = save;
       }
 #endif
 
@@ -136,7 +136,7 @@ int state_printf (STATE * s, const char *fmt, ...)
 
 void state_mark_attach (STATE * s)
 {
-  if ((s->flags & M_DISPLAY) && !str_cmp (Pager, "builtin"))
+  if ((s->flags & M_DISPLAY) && !m_strcmp(Pager, "builtin"))
     state_puts (AttachmentMarker, s);
 }