X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=state.c;h=4d4c19ae150845522322a08632e6992cf8f7d889;hp=3c87f3c11df5248c524d1f58439e450ab52f5800;hb=9eb3b25249e78d778b6d0583b06a7c5615709e63;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/state.c b/state.c
index 3c87f3c..4d4c19a 100644
--- a/state.c
+++ b/state.c
@@ -13,13 +13,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <lib-lib/debug.h>
+
 #include "mutt.h"
 #include "state.h"
 #include "rfc3676.h"
 
-#include "lib/debug.h"
-
-static void state_prefix_put (const char *d, size_t dlen, STATE * s)
+static void state_prefix_put (const char *d, ssize_t dlen, STATE * s)
 {
   if (s->prefix)
     while (dlen--)
@@ -28,12 +28,12 @@ static void state_prefix_put (const char *d, size_t dlen, STATE * s)
     fwrite (d, dlen, 1, s->fpout);
 }
 
-void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s)
+void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
 {
   char bufo[BUFO_SIZE];
   const char *ib;
   char *ob;
-  size_t ibl, obl;
+  ssize_t ibl, obl;
 
   if (!bufi) {
     if (cd != (iconv_t) (-1)) {
@@ -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);
 }