[PATCH] Remove any optional headers

To: mutt-dev@xxxxxxxx
Subject: [PATCH] Remove any optional headers
From: Erik Hovland <erik@xxxxxxxxxxx>
Date: Tue, 16 Dec 2008 13:48:42 -0800
List-post: <mailto:mutt-dev@mutt.org>
List-unsubscribe: send mail to majordomo@mutt.org, body only "unsubscribe mutt-dev"
Sender: owner-mutt-dev@xxxxxxxx
35 files changed, 88 deletions(-)
alias.c      |    1 -
attach.c     |    3 ---
buffy.c      |    1 -
color.c      |    1 -
commands.c   |    1 -
compose.c    |    1 -
crypt.c      |    7 -------
curs_main.c  |    4 ----
flags.c      |    4 ----
group.c      |    8 --------
hcache.c     |    4 ----
hdrline.c    |    1 -
imap/util.c  |    1 -
init.c       |    1 -
mbox.c       |    1 -
mh.c         |    6 ------
muttlib.c    |    1 -
mx.c         |    2 --
pager.c      |    3 ---
pgp.c        |    6 ------
pgpkey.c     |    1 -
pgpmicalg.c  |    1 -
pgppacket.c  |    2 --
postpone.c   |    2 --
query.c      |    2 --
recvattach.c |    4 ----
recvcmd.c    |    4 ----
rfc1524.c    |    2 --
send.c       |    2 --
signal.c     |    1 -
smime.c      |    6 ------
sort.c       |    1 -
status.c     |    1 -
system.c     |    1 -
thread.c     |    1 -


# HG changeset patch
# User Erik Hovland <erik@xxxxxxxxxxx>
# Date 1229463968 28800
# Branch HEAD
# Node ID f40ed4a28f4dc9d9728aa219fac5280cca9ebeda
# Parent  42a16583ecc729bcd276e69e8ac17fdee23ef6ff
Remove any optional headers

Some headers provide no useful symbols to the file that includes it.
This means that the header is optional. And since it is optional, then
removing it saves time (less for cpp to process) and space.

diff --git a/alias.c b/alias.c
--- a/alias.c
+++ b/alias.c
@@ -26,7 +26,6 @@
 #include "mutt_idna.h"
 
 #include <string.h>
-#include <ctype.h>
 
 ADDRESS *mutt_lookup_alias (const char *s)
 {
diff --git a/attach.c b/attach.c
--- a/attach.c
+++ b/attach.c
@@ -34,14 +34,11 @@
 #include "mx.h"
 #include "mutt_crypt.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 
 int mutt_get_tmp_attachment (BODY *a)
 {
diff --git a/buffy.c b/buffy.c
--- a/buffy.c
+++ b/buffy.c
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <utime.h>
-#include <ctype.h>
 #include <unistd.h>
 
 #include <stdio.h>
diff --git a/color.c b/color.c
--- a/color.c
+++ b/color.c
@@ -26,7 +26,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <ctype.h>
 
 /* globals */
 int *ColorQuote;
diff --git a/commands.c b/commands.c
--- a/commands.c
+++ b/commands.c
@@ -46,7 +46,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <utime.h>
diff --git a/compose.c b/compose.c
--- a/compose.c
+++ b/compose.c
@@ -40,7 +40,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
 
diff --git a/crypt.c b/crypt.c
--- a/crypt.c
+++ b/crypt.c
@@ -30,22 +30,15 @@
 #include "mime.h"
 #include "copy.h"
 #include "mutt_crypt.h"
-#include "pgp.h"
 
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H
diff --git a/curs_main.c b/curs_main.c
--- a/curs_main.c
+++ b/curs_main.c
@@ -23,11 +23,9 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "attach.h"
 #include "mailbox.h"
 #include "mapping.h"
 #include "sort.h"
-#include "buffy.h"
 #include "mx.h"
 
 #ifdef USE_POP
@@ -44,10 +42,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <errno.h>
 
 #include <assert.h>
 
diff --git a/flags.c b/flags.c
--- a/flags.c
+++ b/flags.c
@@ -24,10 +24,6 @@
 #include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
-
-#ifdef USE_IMAP
-#include "imap_private.h"
-#endif
 
 void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 {
diff --git a/group.c b/group.c
--- a/group.c
+++ b/group.c
@@ -21,23 +21,15 @@
 #endif
 
 #include "mutt.h"
-#include "mapping.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
-#include "history.h"
-#include "keymap.h"
 #include "mbyte.h"
 #include "charset.h"
-#include "mutt_crypt.h"
-#include "mutt_idna.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/utsname.h>
-#include <errno.h>
-#include <sys/wait.h>
 
 group_t *mutt_pattern_group (const char *k)
 {
diff --git a/hcache.c b/hcache.c
--- a/hcache.c
+++ b/hcache.c
@@ -42,10 +42,6 @@
 #include "mutt.h"
 #include "hcache.h"
 #include "hcversion.h"
-#ifdef USE_IMAP
-#include "message.h"
-#endif
-#include "mime.h"
 #include "mx.h"
 #include "lib.h"
 #include "md5.h"
diff --git a/hdrline.c b/hdrline.c
--- a/hdrline.c
+++ b/hdrline.c
@@ -27,7 +27,6 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
diff --git a/imap/util.c b/imap/util.c
--- a/imap/util.c
+++ b/imap/util.c
@@ -26,7 +26,6 @@
 #include "mx.h"        /* for M_IMAP */
 #include "url.h"
 #include "imap_private.h"
-#include "mutt_ssl.h"
 #ifdef USE_HCACHE
 #include "message.h"
 #include "hcache.h"
diff --git a/init.c b/init.c
--- a/init.c
+++ b/init.c
@@ -48,7 +48,6 @@
 #include <string.h>
 #include <sys/utsname.h>
 #include <errno.h>
-#include <sys/wait.h>
 
 #define CHECK_PAGER \
   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&     \
diff --git a/mbox.c b/mbox.c
--- a/mbox.c
+++ b/mbox.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <utime.h>
 #include <sys/file.h>
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/mh.c b/mh.c
--- a/mh.c
+++ b/mh.c
@@ -30,9 +30,7 @@
 #include "mailbox.h"
 #include "mx.h"
 #include "copy.h"
-#include "buffy.h"
 #include "sort.h"
-#include "account.h"
 #if USE_HCACHE
 #include "hcache.h"
 #endif
@@ -51,10 +49,6 @@
 #include <errno.h>
 #include <string.h>
 #include <utime.h>
-
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #define                INS_SORT_THRESHOLD              6
 
diff --git a/muttlib.c b/muttlib.c
--- a/muttlib.c
+++ b/muttlib.c
@@ -38,7 +38,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <sys/wait.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/mx.c b/mx.c
--- a/mx.c
+++ b/mx.c
@@ -48,13 +48,11 @@
 
 #include <dirent.h>
 #include <fcntl.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <utime.h>
 
 
diff --git a/pager.c b/pager.c
--- a/pager.c
+++ b/pager.c
@@ -26,12 +26,9 @@
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "mapping.h"
-#include "sort.h"
 #include "pager.h"
 #include "attach.h"
 #include "mbyte.h"
-
-#include "mx.h"
 
 #include "mutt_crypt.h"
 
diff --git a/pgp.c b/pgp.c
--- a/pgp.c
+++ b/pgp.c
@@ -41,15 +41,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H
diff --git a/pgpkey.c b/pgpkey.c
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 
 #include <locale.h>
 
diff --git a/pgpmicalg.c b/pgpmicalg.c
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -28,7 +28,6 @@
 #include "mutt.h"
 #include "pgp.h"
 #include "pgppacket.h"
-#include "mime.h"
 #include "charset.h"
 
 #include <stdio.h>
diff --git a/pgppacket.c b/pgppacket.c
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -32,9 +32,7 @@
 /* yuck, we were including this one somewhere below. */
 #include "mutt.h"
 
-#include "sha1.h"
 #include "lib.h"
-#include "pgplib.h"
 #include "pgppacket.h"
 
 #define CHUNKSIZE 1024
diff --git a/postpone.c b/postpone.c
--- a/postpone.c
+++ b/postpone.c
@@ -23,13 +23,11 @@
 
 #include "mutt.h"
 #include "mutt_menu.h"
-#include "rfc1524.h"
 #include "mime.h"
 #include "mailbox.h"
 #include "mapping.h"
 #include "sort.h"
 #ifdef USE_IMAP
-#include "mx.h"
 #include "imap.h"
 #endif
 #include "mutt_crypt.h"
diff --git a/query.c b/query.c
--- a/query.c
+++ b/query.c
@@ -24,11 +24,9 @@
 #include "mutt_menu.h"
 #include "mutt_idna.h"
 #include "mapping.h"
-#include "sort.h"
 
 #include <string.h>
 #include <stdlib.h>
-#include <ctype.h>
 
 typedef struct query
 {
diff --git a/recvattach.c b/recvattach.c
--- a/recvattach.c
+++ b/recvattach.c
@@ -30,16 +30,12 @@
 #include "attach.h"
 #include "mapping.h"
 #include "mx.h"
-#include "copy.h"
 #include "mutt_crypt.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <errno.h>
 
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 
diff --git a/recvcmd.c b/recvcmd.c
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -26,12 +26,8 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
-#include "mailbox.h"
 #include "attach.h"
 #include "mapping.h"
-#include "mx.h"
 #include "copy.h"
 #include "mutt_idna.h"
 
diff --git a/rfc1524.c b/rfc1524.c
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -38,8 +38,6 @@
 #include <ctype.h>
 
 #include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
 #include <unistd.h>
 
 /* The command semantics include the following:
diff --git a/send.c b/send.c
--- a/send.c
+++ b/send.c
@@ -27,7 +27,6 @@
 #include "mime.h"
 #include "mailbox.h"
 #include "copy.h"
-#include "mx.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 #include "url.h"
@@ -39,7 +38,6 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <dirent.h>
 #include <time.h>
 #include <sys/types.h>
diff --git a/signal.c b/signal.c
--- a/signal.c
+++ b/signal.c
@@ -25,7 +25,6 @@
 
 #include <signal.h>
 #include <string.h>
-#include <sys/wait.h>
 #include <errno.h>
 
 static sigset_t Sigset;
diff --git a/smime.c b/smime.c
--- a/smime.c
+++ b/smime.c
@@ -34,15 +34,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H
diff --git a/sort.c b/sort.c
--- a/sort.c
+++ b/sort.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <unistd.h>
 
 #define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
diff --git a/status.c b/status.c
--- a/status.c
+++ b/status.c
@@ -28,7 +28,6 @@
 #include "mx.h"
 
 #include <string.h>
-#include <ctype.h>
 #include <unistd.h>
 
 static char *get_sort_str (char *buf, size_t buflen, int method)
diff --git a/system.c b/system.c
--- a/system.c
+++ b/system.c
@@ -23,7 +23,6 @@
 #include "mutt.h"
 #ifdef USE_IMAP
 # include "imap.h"
-# include <errno.h>
 #endif
 
 #include <stdlib.h>
diff --git a/thread.c b/thread.c
--- a/thread.c
+++ b/thread.c
@@ -24,7 +24,6 @@
 #include "sort.h"
 
 #include <string.h>
-#include <ctype.h>
 
 #define VISIBLE(hdr, ctx) (hdr->virtual >= 0 || (hdr->collapsed && 
(!ctx->pattern || hdr->limited)))
Follow-Ups:
- Re: [PATCH] Remove any optional headers
  - From: Brendan Cully
- Re: [PATCH] Remove any optional headers
  - From: Kyle Wheeler
Prev by Date: Re: [patch] fix a few little buglets in mutt HEAD
Next by Date: Re: [PATCH] Remove any optional headers
Previous by thread: Re: [Mutt] #3140: ignore old flag set by other mail clients
Next by thread: Re: [PATCH] Remove any optional headers
Index(es):
- Date
- Thread