statics

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

diff --git a/handler.c b/handler.c
index e561363..e49d973 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -139,7 +139,7 @@ static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
  * 
  */
 
-void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
 {
   char line[STRING];
   char decline[2 * STRING];
@@ -270,14 +270,14 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
   state_reset_prefix (s);
 }
 
-unsigned char decode_byte (char ch)
+static unsigned char decode_byte (char ch)
 {
   if (ch == 96)
     return 0;
   return ch - 32;
 }
 
-void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
 {
   char tmps[SHORT_STRING];
   char linelen, c, l, out;
@@ -631,7 +631,7 @@ static void enriched_set_flags (const char *tag, struct enriched_state *stte)
   }
 }
 
-int text_enriched_handler (BODY * a, STATE * s)
+static int text_enriched_handler (BODY * a, STATE * s)
 {
   enum {
     TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE

diff --git a/lib-mx/hcache.c b/lib-mx/hcache.c
index 953e70f..3b617cb 100644 (file)
--- a/lib-mx/hcache.c
+++ b/lib-mx/hcache.c
@@ -28,11 +28,11 @@
 #include <lib-hash/hash.h>
 #include <lib-mime/mime.h>
 
+#include <imap/message.h>
+
 #include "charset.h"
 #include "mutt.h"
-#include <imap/message.h>
-#include "mx.h"
-#include "lib.h"
+#include "hcache.h"
 
 struct header_cache {
 #if defined(HAVE_QDBM)

diff --git a/nntp/nntp.h b/nntp/nntp.h
index 4ce5635..9baaed7 100644 (file)
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -109,7 +109,7 @@ int nntp_check_msgid (CONTEXT *, const char *);
 int nntp_check_children (CONTEXT *, const char *);
 void nntp_buffy (char* dst, ssize_t dstlen);
 void nntp_expand_path (char *, ssize_t, ACCOUNT *);
-void nntp_logout_all ();
+void nntp_logout_all(void);
 const char *nntp_format_str (char *, ssize_t, char, const char *, const char *,
                              const char *, const char *, unsigned long,
                              format_flag);

diff --git a/pgpewrap.c b/pgpewrap.c
index b3a84c0..bb9b2d0 100644 (file)
--- a/pgpewrap.c
+++ b/pgpewrap.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <string.h>
 
-void print_usage (const char *progname)
+static void print_usage (const char *progname)
 {
   fprintf (stderr, "Command line usage: %s [flags] -- prefix [recipients]\n",
            progname);

diff --git a/pgppubring.c b/pgppubring.c
index cbac932..b98b321 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -898,13 +898,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
     }
   }
 }
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
-  return (char *) message;
-}