continue the include dance

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index abde630..ab47a38 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -23,24 +23,25 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "state.h"
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/debug.h"
 
 typedef int handler_f (BODY *, STATE *);
 typedef handler_f *handler_t;
@@ -49,7 +50,7 @@ static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
 {
   int c, ch;
   char bufi[BUFI_SIZE];
-  size_t l = 0;
+  ssize_t l = 0;
 
   if (istext) {
     state_set_prefix (s);
@@ -96,7 +97,7 @@ static int qp_decode_triple (char *s, char *d)
   return -1;
 }
 
-static void qp_decode_line (char *dest, char *src, size_t * l, int last)
+static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
 {
   char *d, *s;
   char c;
@@ -157,9 +158,9 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
 {
   char line[STRING];
   char decline[2 * STRING];
-  size_t l = 0;
-  size_t linelen;               /* number of input bytes in `line' */
-  size_t l3;
+  ssize_t l = 0;
+  ssize_t linelen;               /* number of input bytes in `line' */
+  ssize_t l3;
 
   int last;                     /* store the last character in the input line */
 
@@ -210,7 +211,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
   char buf[5];
   int c1, c2, c3, c4, ch, cr = 0, i;
   char bufi[BUFI_SIZE];
-  size_t l = 0;
+  ssize_t l = 0;
 
   buf[4] = 0;
 
@@ -298,7 +299,7 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
   char linelen, c, l, out;
   char *pt;
   char bufi[BUFI_SIZE];
-  size_t k = 0;
+  ssize_t k = 0;
 
   if (istext)
     state_set_prefix (s);
@@ -377,15 +378,15 @@ struct enriched_state {
   char *buffer;
   char *line;
   char *param;
-  size_t buff_len;
-  size_t line_len;
-  size_t line_used;
-  size_t line_max;
-  size_t indent_len;
-  size_t word_len;
-  size_t buff_used;
-  size_t param_used;
-  size_t param_len;
+  ssize_t buff_len;
+  ssize_t line_len;
+  ssize_t line_used;
+  ssize_t line_max;
+  ssize_t indent_len;
+  ssize_t word_len;
+  ssize_t buff_used;
+  ssize_t param_used;
+  ssize_t param_len;
   int tag_level[RICH_LAST_TAG];
   int WrapMargin;
   STATE *s;
@@ -399,7 +400,7 @@ static void enriched_wrap (struct enriched_state *stte)
   if (stte->line_len) {
     if (stte->tag_level[RICH_CENTER] || stte->tag_level[RICH_FLUSHRIGHT]) {
       /* Strip trailing white space */
-      size_t y = stte->line_used - 1;
+      ssize_t y = stte->line_used - 1;
 
       while (y && ISSPACE (stte->line[y])) {
         stte->line[y] = '\0';
@@ -414,7 +415,7 @@ static void enriched_wrap (struct enriched_state *stte)
         while (stte->line[y] && ISSPACE (stte->line[y]))
           y++;
         if (y) {
-          size_t z;
+          ssize_t z;
 
           for (z = y; z <= stte->line_used; z++) {
             stte->line[z - y] = stte->line[z];
@@ -771,7 +772,7 @@ static int alternative_handler (BODY * a, STATE * s)
 {
   BODY *choice = NULL;
   BODY *b;
-  LIST *t;
+  string_list_t *t;
   char buf[STRING];
   int type = 0;
   int mustfree = 0;
@@ -1312,7 +1313,7 @@ int mutt_body_handler (BODY * b, STATE * s)
   char tempfile[_POSIX_PATH_MAX];
   handler_t handler = NULL;
   long tmpoffset = 0;
-  size_t tmplength = 0;
+  ssize_t tmplength = 0;
   char type[STRING];
   int rc = 0;