X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=6d8421efd22db9e8b26da172cb71299106661307;hp=36ed33ac51f0b04b31a5237f0ed92e51a89e166d;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f

diff --git a/curs_main.c b/curs_main.c
index 36ed33a..6d8421e 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -261,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 */
@@ -309,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);
     }
@@ -419,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,
@@ -934,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;
 
@@ -950,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);
         }
@@ -994,7 +994,7 @@ int mutt_index_menu (void)
 
     case OP_QUIT:
 
-      close = op;
+      closed = op;
       if (attach_msg) {
         done = 1;
         break;
@@ -1122,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;
 
@@ -1326,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;
@@ -2386,7 +2386,7 @@ int mutt_index_menu (void)
   }
 
   mutt_menuDestroy (&menu);
-  return (close);
+  return (closed);
 }
 
 void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)