X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=f71f3637ed1c520f79bd1be7793b6d300e2fde86;hp=7e7b455b13dd53193516198c81d8bb98554813d8;hb=8cf8034a805e70fb34b170e9ceefdf99a2797e60;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/init.c b/init.c
index 7e7b455..f71f363 100644
--- a/init.c
+++ b/init.c
@@ -10,19 +10,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#include <sys/wait.h>
-
 #include <lib-lib/lib-lib.h>
+#include <sys/utsname.h>
 
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_ssl.h>
@@ -249,14 +238,14 @@ static void sys_to_string (char* dst, ssize_t dstlen,
   int clean = 0;
 
   /* get some $madmutt_ values dynamically */
-  if (ascii_strcmp ("madmutt_pwd", option->option) == 0) {
+  if (m_strcmp("madmutt_pwd", option->option) == 0) {
     val = p_new(char, _POSIX_PATH_MAX);
     val = getcwd (val, _POSIX_PATH_MAX-1);
     clean = 1;
-  } else if (ascii_strcmp ("madmutt_folder_path", option->option) == 0 &&
+  } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
     val = CurrentFolder;
-  } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 &&
+  } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
 
     ssize_t Maildirlength = m_strlen(Maildir);
@@ -562,7 +551,7 @@ static void syn_del (void** p) {
   p_delete(p);
 }
 
-void toggle_quadoption (int opt)
+static void toggle_quadoption (int opt)
 {
   int n = opt / 4;
   int b = (opt % 4) * 2;
@@ -1822,7 +1811,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     }
 
     /* see if we need to add $user_ var */
-    if (!option && ascii_strncmp ("user_", tmp->data, 5) == 0) {
+    if (!option && m_strncmp("user_", tmp->data, 5) == 0) {
       /* there's no option named like this yet so only add one
        * if the action isn't any of: reset, unset, query */
       if (!(reset || unset || query || *s->dptr != '=')) {