continue the include dance

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/browser.c b/browser.c
index 69351d0..12c41a9 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -11,6 +11,16 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

+#include <stdlib.h>
+#include <dirent.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <pwd.h>
+#include <grp.h>
+

 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>


@@ -37,14 +47,6 @@
 
 #include "lib/list.h"
 
 
 #include "lib/list.h"
 

-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-

 static struct mapping_t FolderHelp[] = {
   {N_("Exit"), OP_EXIT},
   {N_("Chdir"), OP_CHANGE_DIRECTORY},
 static struct mapping_t FolderHelp[] = {
   {N_("Exit"), OP_EXIT},
   {N_("Chdir"), OP_CHANGE_DIRECTORY},

diff --git a/handler.c b/handler.c
index 9ab5231..ab47a38 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -50,7 +50,7 @@ static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
 {
   int c, ch;
   char bufi[BUFI_SIZE];
 {
   int c, ch;
   char bufi[BUFI_SIZE];

-  size_t l = 0;
+  ssize_t l = 0;

 
   if (istext) {
     state_set_prefix (s);
 
   if (istext) {
     state_set_prefix (s);


@@ -97,7 +97,7 @@ static int qp_decode_triple (char *s, char *d)
   return -1;
 }
 
   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;
 {
   char *d, *s;
   char c;


@@ -158,9 +158,9 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
 {
   char line[STRING];
   char decline[2 * STRING];
 {
   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 */
 
 
   int last;                     /* store the last character in the input line */
 


@@ -211,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];
   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;
 
 
   buf[4] = 0;
 


@@ -299,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];
   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);
 
   if (istext)
     state_set_prefix (s);


@@ -378,15 +378,15 @@ struct enriched_state {
   char *buffer;
   char *line;
   char *param;
   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;
   int tag_level[RICH_LAST_TAG];
   int WrapMargin;
   STATE *s;


@@ -400,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 */
   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';
 
       while (y && ISSPACE (stte->line[y])) {
         stte->line[y] = '\0';


@@ -415,7 +415,7 @@ static void enriched_wrap (struct enriched_state *stte)
         while (stte->line[y] && ISSPACE (stte->line[y]))
           y++;
         if (y) {
         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];
 
           for (z = y; z <= stte->line_used; z++) {
             stte->line[z - y] = stte->line[z];


@@ -1313,7 +1313,7 @@ int mutt_body_handler (BODY * b, STATE * s)
   char tempfile[_POSIX_PATH_MAX];
   handler_t handler = NULL;
   long tmpoffset = 0;
   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;
 
   char type[STRING];
   int rc = 0;
 

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index 3c2ded8..43907ca 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -55,6 +55,7 @@
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
 #include <lib-ui/menu.h>
 
 #include "mutt.h"

+#include "lib.h"

 #include "alias.h"
 #include <lib-crypt/crypt.h>
 #include "handler.h"
 #include "alias.h"
 #include <lib-crypt/crypt.h>
 #include "handler.h"

diff --git a/mutt.h b/mutt.h
index 6e1726a..0e2b285 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -11,33 +11,18 @@
 #ifndef _MUTT_H
 #define _MUTT_H
 
 #ifndef _MUTT_H
 #define _MUTT_H
 

+#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

+#endif

 
 #include <stdio.h>
 
 #include <stdio.h>

-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>            /* needed for SEEK_SET */
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>

 #include <limits.h>
 #include <limits.h>

-#include <stdarg.h>

 #include <signal.h>
 #include <signal.h>

-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS)
-# include <wctype.h>
-#endif

 
 #ifndef _POSIX_PATH_MAX
 #include <posix1_lim.h>
 #endif
 
 
 #ifndef _POSIX_PATH_MAX
 #include <posix1_lim.h>
 #endif
 

-#include <pwd.h>
-#include <grp.h>
-

 #include <lib-lib/buffer.h>
 #include <lib-lib/hash.h>
 #include <lib-lib/list.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/hash.h>
 #include <lib-lib/list.h>


@@ -604,7 +589,6 @@ typedef struct {
 #define M_PARTS_RECOUNT (1<<1) /* force recount */
 
 #include "protos.h"
 #define M_PARTS_RECOUNT (1<<1) /* force recount */
 
 #include "protos.h"

-#include "lib.h"

 #include "globals.h"
 
 #endif /* !_MUTT_H */
 #include "globals.h"
 
 #endif /* !_MUTT_H */

diff --git a/muttlib.c b/muttlib.c
index b130f8e..3e8bc09 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -12,16 +12,18 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

-#include <string.h>

 #include <ctype.h>
 #include <ctype.h>

-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/wait.h>

 #include <errno.h>
 #include <errno.h>

-#include <sys/stat.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <time.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>

 #include <sys/types.h>
 #include <sys/types.h>

+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>

 #include <utime.h>
 
 #include <lib-lib/mem.h>
 #include <utime.h>
 
 #include <lib-lib/mem.h>

diff --git a/protos.h b/protos.h
index 2d11aac..53b2b4f 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

+#include <sys/stat.h>
+

 #if HAVE_STDINT_H
 #include <stdint.h>
 #elif HAVE_INTTYPES_H
 #if HAVE_STDINT_H
 #include <stdint.h>
 #elif HAVE_INTTYPES_H

diff --git a/state.c b/state.c
index 4d4c19a..f5642af 100644 (file)
--- a/state.c
+++ b/state.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>

+#include <stdarg.h>

 
 #include <lib-lib/debug.h>
 
 
 #include <lib-lib/debug.h>