Fix shadow declaration and tag unused attribute

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/send.c b/send.c
index 037c660..6d14c69 100644 (file)
--- a/send.c
+++ b/send.c
@@ -596,8 +596,10 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
   m_strreplace(&env->subject, buffer);
 }
 
   m_strreplace(&env->subject, buffer);
 }
 

-void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
-                                   HEADER * cur, ENVELOPE * curenv)
+void mutt_make_misc_reply_headers (ENVELOPE * env,
+                                   CONTEXT * ctx __attribute__ ((unused)),
+                                   HEADER * cur __attribute__ ((unused)),
+                                   ENVELOPE * curenv)

 {
   /* This takes precedence over a subject that might have
    * been taken from a List-Post header.  Is that correct?
 {
   /* This takes precedence over a subject that might have
    * been taken from a List-Post header.  Is that correct?


@@ -835,13 +837,13 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
       return -1;
   }
   else if (flags & SENDKEY) {
       return -1;
   }
   else if (flags & SENDKEY) {

-    BODY *tmp;
+    BODY *btmp;

 
 

-    if ((tmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
+    if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)

       return -1;
 
       return -1;
 

-    tmp->next = msg->content;
-    msg->content = tmp;
+    btmp->next = msg->content;
+    msg->content = btmp;

   }
 
   mutt_clear_error ();
   }
 
   mutt_clear_error ();