X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=d0c25e15a597ee55638468df0787106e3d1b3c0c;hp=fdaf0c92b1f17c9dcc76b1c3b8db97fc965b40b2;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f

diff --git a/init.c b/init.c
index fdaf0c9..d0c25e1 100644
--- a/init.c
+++ b/init.c
@@ -186,7 +186,8 @@ static void bool_to_string (char* dst, size_t dstlen,
 }
 
 static int bool_from_string (struct option_t* dst, const char* val,
-                             char* errbuf, size_t errlen) {
+                             char* errbuf __attribute__ ((unused)),
+                             size_t errlen __attribute__ ((unused))) {
   int flag = -1;
 
   if (!dst)
@@ -273,7 +274,7 @@ static void sys_to_string (char* dst, size_t dstlen,
   } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
              CurrentFolder && *CurrentFolder) {
 
-    size_t Maildirlength = m_strlen(Maildir);
+    ssize_t Maildirlength = m_strlen(Maildir);
 
     /*
      * if name starts with $folder, just strip it to keep hierarchy
@@ -290,10 +291,10 @@ static void sys_to_string (char* dst, size_t dstlen,
       val = t+1;
     /* default: use as-is */
     else
-      val = CurrentFolder;
+      val = (char *) CurrentFolder;
 
   } else
-    val = option->init;
+    val = (char *) option->init;
 
   snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
   if (clean)
@@ -301,7 +302,7 @@ static void sys_to_string (char* dst, size_t dstlen,
 }
 
 static int path_from_string (struct option_t* dst, const char* val,
-                             char* errbuf, size_t errlen) {
+                             char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) {
   char path[_POSIX_PATH_MAX];
 
   if (!dst)
@@ -332,7 +333,7 @@ static int str_from_string (struct option_t* dst, const char* val,
 }
 
 static int user_from_string (struct option_t* dst, const char* val,
-                             char* errbuf, size_t errlen) {
+                             char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) {
   /* if dst == NULL, we may get here in case the user did unset it,
    * see parse_set() where item is free()'d before coming here; so
    * just silently ignore it */
@@ -357,7 +358,7 @@ static void quad_to_string (char* dst, size_t dstlen,
 }
 
 static int quad_from_string (struct option_t* dst, const char* val,
-                             char* errbuf, size_t errlen) {
+                             char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) {
   int flag = -1;
 
   if (!dst)
@@ -491,7 +492,7 @@ static void magic_to_string (char* dst, size_t dstlen,
 }
 
 static int magic_from_string (struct option_t* dst, const char* val,
-                              char* errbuf, size_t errlen) {
+                              char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) {
   int flag = -1;
 
   if (!dst || !val || !*val)
@@ -522,7 +523,7 @@ static void addr_to_string (char* dst, size_t dstlen,
 }
 
 static int addr_from_string (struct option_t* dst, const char* val,
-                             char* errbuf, size_t errlen) {
+                             char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) {
   if (!dst)
     return (0);
   address_delete ((address_t**) dst->data);
@@ -824,7 +825,8 @@ static int remove_from_rx_list (list2_t** l, const char *str)
 static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
                         BUFFER * err)
 {
-  int i, j, res = 0;
+  int i, j;
+  unsigned long res = 0;
   BUFFER token;
   struct option_t* option = NULL;
 
@@ -884,8 +886,9 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
-                           BUFFER * err)
+static int parse_unignore (BUFFER * buf, BUFFER * s,
+                           unsigned long data __attribute__ ((unused)),
+                           BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -901,8 +904,9 @@ static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
-                         BUFFER * err)
+static int parse_ignore (BUFFER * buf, BUFFER * s,
+                         unsigned long data __attribute__ ((unused)),
+                         BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -914,8 +918,9 @@ static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_list (BUFFER * buf, BUFFER * s, unsigned long data,
-                       BUFFER * err)
+static int parse_list (BUFFER * buf, BUFFER * s,
+                       unsigned long data __attribute__ ((unused)),
+                       BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -936,8 +941,9 @@ static void _alternates_clean (void)
   }
 }
 
-static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
-                             BUFFER * err)
+static int parse_alternates (BUFFER * buf, BUFFER * s,
+                             unsigned long data __attribute__ ((unused)),
+                             BUFFER * err __attribute__ ((unused)))
 {
   _alternates_clean ();
   do {
@@ -952,8 +958,9 @@ static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
-                               BUFFER * err)
+static int parse_unalternates (BUFFER * buf, BUFFER * s,
+                               unsigned long data __attribute__ ((unused)),
+                               BUFFER * err __attribute__ ((unused)))
 {
   _alternates_clean ();
   do {
@@ -1039,7 +1046,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
-                         BUFFER * err)
+                         BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -1057,7 +1064,8 @@ static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_lists (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_lists (BUFFER * buf, BUFFER * s,
+                        unsigned long data __attribute__ ((unused)),
                         BUFFER * err)
 {
   do {
@@ -1082,7 +1090,7 @@ static void _attachments_clean (void) {
 }
 
 static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
-                              BUFFER *err) {
+                              BUFFER *err __attribute__ ((unused))) {
   ATTACH_MATCH *a;
   LIST *listp, *lastp;
   char *p;
@@ -1154,7 +1162,8 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
   return 0;
 }
 
-static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err) {
+static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata,
+                                BUFFER *err __attribute__ ((unused))) {
   ATTACH_MATCH *a;
   LIST *lp, *lastp, *newlp;
   char *tmp;
@@ -1175,7 +1184,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er
       *minor = '\0';
       ++minor;
     } else {
-      minor = "unknown";
+      minor = m_strdup("unknown");
     }
     major = mutt_check_mime_type(tmp);
 
@@ -1227,7 +1236,9 @@ static int print_attach_list (LIST *lp, char op, const char *name) {
   return 0;
 }
 
-static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_attachments (BUFFER *buf, BUFFER *s,
+                              unsigned long data __attribute__ ((unused)),
+                              BUFFER *err) {
   char op, *category;
   LIST **listp;
 
@@ -1277,7 +1288,7 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER
   return parse_attach_list(buf, s, listp, err);
 }
 
-static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) {
+static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __attribute__ ((unused)), BUFFER *err) {
   char op, *p;
   LIST **listp;
 
@@ -1313,8 +1324,9 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF
   return parse_unattach_list(buf, s, listp, err);
 }
 
-static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
-                          BUFFER * err)
+static int parse_unlists (BUFFER * buf, BUFFER * s,
+                          unsigned long data __attribute__ ((unused)),
+                          BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -1330,7 +1342,7 @@ static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                             BUFFER * err)
 {
   do {
@@ -1348,8 +1360,9 @@ static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
-                              BUFFER * err)
+static int parse_unsubscribe (BUFFER * buf, BUFFER * s,
+                              unsigned long data __attribute__ ((unused)),
+                              BUFFER * err __attribute__ ((unused)))
 {
   do {
     mutt_extract_token (buf, s, 0);
@@ -1364,8 +1377,9 @@ static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
-                          BUFFER * err)
+static int parse_unalias (BUFFER * buf, BUFFER * s,
+                          unsigned long data __attribute__ ((unused)),
+                          BUFFER * err __attribute__ ((unused)))
 {
   ALIAS *tmp, *last = NULL;
 
@@ -1406,7 +1420,8 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 }
 
-static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_alias (BUFFER * buf, BUFFER * s,
+                        unsigned long data __attribute__ ((unused)),
                         BUFFER * err)
 {
   ALIAS *tmp = Aliases;
@@ -1475,7 +1490,9 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 static int
-parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
+parse_unmy_hdr (BUFFER * buf, BUFFER * s,
+                unsigned long data __attribute__ ((unused)),
+                BUFFER * err __attribute__ ((unused)))
 {
   LIST *last = NULL;
   LIST *tmp = UserHeader;
@@ -1517,7 +1534,7 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
   return 0;
 }
 
-static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                          BUFFER * err)
 {
   LIST *tmp;
@@ -1582,7 +1599,7 @@ parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
 }
 
 /* if additional data more == 1, we want to resolve synonyms */
-static void mutt_set_default(const char *name, void* p, unsigned long more)
+static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, unsigned long more)
 {
     char buf[LONG_STRING];
     struct option_t *ptr = p;
@@ -1663,8 +1680,8 @@ static int init_expand (char** dst, struct option_t* src) {
 }
 
 /* if additional data more == 1, we want to resolve synonyms */
-static void mutt_restore_default (const char* name, void* p,
-                                  unsigned long more) {
+static void mutt_restore_default (const char* name __attribute__ ((unused)),
+                                  void* p, unsigned long more) {
   char errbuf[STRING];
   struct option_t* ptr = (struct option_t*) p;
   char* init = NULL;
@@ -1705,7 +1722,7 @@ static void mutt_restore_default (const char* name, void* p,
 }
 
 /* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* option, unsigned long p,
+static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p,
                              char* errbuf, size_t errlen) {
   char* val = (char*) p;
   if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
@@ -1721,7 +1738,8 @@ static int check_dsn_return (const char* option, unsigned long p,
 static int check_dsn_notify (const char* option, unsigned long p,
                              char* errbuf, size_t errlen) {
   list2_t* list = NULL;
-  int i = 0, rc = 1;
+  size_t i = 0;
+  int rc = 1;
   char* val = (char*) p;
 
   if (!val || !*val)
@@ -1768,7 +1786,7 @@ static int check_debug (const char* option, unsigned long p,
 }
 #endif
 
-static int check_history (const char* option, unsigned long p,
+static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
                           char* errbuf, size_t errlen) {
   if (!check_num ("history", p, errbuf, errlen))
     return (0);
@@ -2131,7 +2149,8 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
 #undef MAXERRS
 
-static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
+static int parse_source (BUFFER * tmp, BUFFER * s,
+                         unsigned long data __attribute__ ((unused)),
                          BUFFER * err)
 {
   char path[_POSIX_PATH_MAX];
@@ -2481,7 +2500,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
       else
         return 0;
 
-      for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof(tmp2) - 2;) {
+      for (s = tmp, d = tmp2; *s && (d - tmp2) < ssizeof(tmp2) - 2;) {
         if (*s == '\\' || *s == '"')
           *d++ = '\\';
         *d++ = *s++;
@@ -2553,7 +2572,8 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   struct utsname utsname;
   const char *p;
   char buffer[STRING], error[STRING];
-  int i, default_rc = 0, need_pause = 0;
+  int default_rc = 0, need_pause = 0;
+  unsigned int i;
   BUFFER err;
 
   p_clear(&err, 1);
@@ -2822,7 +2842,7 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
   /* warn about synonym variables */
   if (!list_empty(Synonyms)) {
-    int i = 0;
+    i = 0;
     fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
     for (i = 0; i < Synonyms->length; i++) {
       struct option_t* newopt = NULL, *oldopt = NULL;
@@ -2867,7 +2887,8 @@ static int opt_cmp (const void* a, const void* b) {
 }
 
 /* callback for hash_map() to put all non-synonym vars into list */
-static void opt_sel_full (const char* key, void* data,
+static void opt_sel_full (const char* key __attribute__ ((unused)),
+                          void* data,
                           unsigned long more) {
   list2_t** l = (list2_t**) more;
   struct option_t* option = (struct option_t*) data;
@@ -2878,7 +2899,8 @@ static void opt_sel_full (const char* key, void* data,
 }
 
 /* callback for hash_map() to put all changed non-synonym vars into list */
-static void opt_sel_diff (const char* key, void* data,
+static void opt_sel_diff (const char* key __attribute__ ((unused)),
+                          void* data,
                           unsigned long more) {
   list2_t** l = (list2_t**) more;
   struct option_t* option = (struct option_t*) data;
@@ -2894,7 +2916,7 @@ static void opt_sel_diff (const char* key, void* data,
 
 /* dump out the value of all the variables we have */
 int mutt_dump_variables (int full) {
-  int i = 0;
+  size_t i = 0;
   char outbuf[STRING];
   list2_t* tmp = NULL;
   struct option_t* option = NULL;