X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=4129fda38e6231eb9208430e3e4d20fa66abc339;hp=9ab5231b44bd4cbf4fa4cccb33004c3750f98c4d;hb=24a996896edb7b7fc8f5fd5950a07c4a52a42d05;hpb=108f3c7ab59844591f7540347914ea57be5245e2 diff --git a/handler.c b/handler.c index 9ab5231..4129fda 100644 --- a/handler.c +++ b/handler.c @@ -23,7 +23,6 @@ #include #include #include -#include #include @@ -50,7 +49,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); @@ -97,7 +96,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; @@ -158,9 +157,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 */ @@ -211,7 +210,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; @@ -226,7 +225,6 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) buf[i++] = ch; } if (i != 4) { - debug_print (2, ("didn't get a multiple of 4 chars.\n")); break; } @@ -299,7 +297,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); @@ -378,15 +376,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; @@ -400,7 +398,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'; @@ -415,7 +413,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]; @@ -1313,7 +1311,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;