X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=6d8421efd22db9e8b26da172cb71299106661307;hp=18822d469951006c027a22661513d454de9854fa;hb=61fec8f6b3bff64d96d016a14729ab1ea2c4a2e8;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/curs_main.c b/curs_main.c
index 18822d4..6d8421e 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -17,12 +17,12 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
@@ -113,7 +113,6 @@ static const char *No_visible = N_("No visible messages.");
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-extern const char *ReleaseDate;
 extern size_t UngetCount;
 
 void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
@@ -262,7 +261,7 @@ static int mx_toggle_write (CONTEXT * ctx)
   return 0;
 }
 
-static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
+static void update_index (MUTTMENU * menu, CONTEXT * ctx __attribute__ ((unused)), int check,
                           int oldcount, int index_hint)
 {
   /* store pointers to the newly added messages */
@@ -310,13 +309,13 @@ static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
   /* uncollapse threads with new mail */
   if ((Sort & SORT_MASK) == SORT_THREADS) {
     if (check == M_REOPENED) {
-      THREAD *h, *j;
+      THREAD *h, *c;
 
       Context->collapsed = 0;
 
       for (h = Context->tree; h; h = h->next) {
-        for (j = h; !j->message; j = j->child);
-        mutt_uncollapse_thread (Context, j->message);
+        for (c = h; !c->message; c = c->child);
+        mutt_uncollapse_thread (Context, c->message);
       }
       mutt_set_virtual (Context);
     }
@@ -420,14 +419,14 @@ int mutt_index_menu (void)
   char *cp;                     /* temporary variable. */
   int index_hint;               /* used to restore cursor position */
   int do_buffy_notify = 1;
-  int close = 0;                /* did we OP_QUIT or OP_EXIT out of this menu? */
+  int closed = 0;                /* did we OP_QUIT or OP_EXIT out of this menu? */
   int attach_msg = option (OPTATTACHMSG);
 
   menu = mutt_new_menu ();
   menu->menu = MENU_MAIN;
   menu->offset = 1;
   menu->pagelen = LINES - 3;
-  menu->make_entry = index_make_entry;
+  menu->make_entry = (void *) index_make_entry;
   menu->color = index_color;
   menu->current = ci_first_message ();
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
@@ -935,11 +934,11 @@ int mutt_index_menu (void)
         mutt_message (_("No limit pattern is in effect."));
 
       else {
-        char buf[STRING];
+        char buffer[STRING];
 
         /* i18n: ask for a limit to apply */
-        snprintf (buf, sizeof (buf), _("Limit: %s"), Context->pattern);
-        mutt_message ("%s", buf);
+        snprintf (buffer, sizeof (buffer), _("Limit: %s"), Context->pattern);
+        mutt_message ("%s", buffer);
       }
       break;
 
@@ -951,11 +950,11 @@ int mutt_index_menu (void)
                           && menu->current <
                           Context->vcount) ? CURHDR->index : -1;
       if (op == OP_TOGGLE_READ) {
-        char buf[LONG_STRING];
+        char buffer[LONG_STRING];
 
         if (!Context->pattern
             || strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
-          snprintf (buf, sizeof (buf), "!~R!~D~s%s",
+          snprintf (buffer, sizeof (buffer), "!~R!~D~s%s",
                     Context->pattern ? Context->pattern : ".*");
           set_option (OPTHIDEREAD);
         }
@@ -995,7 +994,7 @@ int mutt_index_menu (void)
 
     case OP_QUIT:
 
-      close = op;
+      closed = op;
       if (attach_msg) {
         done = 1;
         break;
@@ -1123,7 +1122,7 @@ int mutt_index_menu (void)
       CHECK_READONLY;
       {
         int oldvcount = Context->vcount;
-        int oldcount = Context->msgcount;
+        oldcount = Context->msgcount;
         int dcount = 0;
         int check;
 
@@ -1234,18 +1233,18 @@ int mutt_index_menu (void)
         mutt_error (_("%s is not a mailbox."), buf);
         break;
       }
-      str_replace (&CurrentFolder, buf);
+      m_strreplace(&CurrentFolder, buf);
 
       if (Context) {
         int check;
 
 #ifdef USE_COMPRESSED
         if (Context->compressinfo && Context->realpath)
-          str_replace (&LastFolder, Context->realpath);
+          m_strreplace(&LastFolder, Context->realpath);
         else
 #endif
 
-          str_replace (&LastFolder, Context->path);
+          m_strreplace(&LastFolder, Context->path);
         oldcount = Context ? Context->msgcount : 0;
 
         if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
@@ -1327,7 +1326,7 @@ int mutt_index_menu (void)
 
     case OP_EXIT:
 
-      close = op;
+      closed = op;
       if (menu->menu == MENU_MAIN && attach_msg) {
         done = 1;
         break;
@@ -2387,7 +2386,7 @@ int mutt_index_menu (void)
   }
 
   mutt_menuDestroy (&menu);
-  return (close);
+  return (closed);
 }
 
 void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)