X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=ed87f4bd88675096e79f2b1e9ccd3a14784fe312;hp=ce83c0ca36c999deea93e1ecd0863a6ab0fffa0f;hb=8336b26fc23c7943bf6681ba2c290bb5cd2c54b8;hpb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1

diff --git a/send.c b/send.c
index ce83c0c..ed87f4b 100644
--- a/send.c
+++ b/send.c
@@ -8,7 +8,6 @@
  */
 
 #include <lib-lib/lib-lib.h>
-#include <utime.h>
 
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
@@ -48,7 +47,7 @@ static void append_signature (FILE * f)
     else if (SignOffString)
       fputs ("\n", f);
     mutt_copy_stream (tmpfp, f);
-    fclose (tmpfp);
+    m_fclose(&tmpfp);
     if (thepid != -1)
       mutt_wait_filter (thepid);
   }
@@ -596,8 +595,10 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
   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?
@@ -835,13 +836,13 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
       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;
 
-    tmp->next = msg->content;
-    msg->content = tmp;
+    btmp->next = msg->content;
+    msg->content = btmp;
   }
 
   mutt_clear_error ();
@@ -986,13 +987,13 @@ static int send_message (HEADER * msg)
   fputc ('\n', tempfp);         /* tie off the header. */
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
-    fclose (tempfp);
+    m_fclose(&tempfp);
     unlink (tempfile);
     return (-1);
   }
 
-  if (fclose (tempfp) != 0) {
-    mutt_perror (tempfile);
+  if (m_fclose(&tempfp) != 0) {
+    mutt_perror (_("Can't create temporary file"));
     unlink (tempfile);
     return (-1);
   }
@@ -1046,7 +1047,7 @@ static void fix_end_of_file (const char *data)
   fseeko (fp, -1, SEEK_END);
   if ((c = fgetc (fp)) != '\n')
     fputc ('\n', fp);
-  safe_fclose (&fp);
+  m_fclose(&fp);
 }
 
 int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
@@ -1370,11 +1371,11 @@ int ci_send_message (int flags, /* send mode */
     msg->env->from->personal = m_strdup(Realname);
 
   if (!(flags & SENDKEY))
-    safe_fclose (&tempfp);
+    m_fclose(&tempfp);
 
   if (!(flags & SENDBATCH)) {
     struct stat st;
-    time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
+    time_t mtime = m_decrease_mtime(msg->content->filename, NULL);
 
     mutt_update_encoding (msg->content);
 
@@ -1785,7 +1786,7 @@ cleanup:
     }
   }
 
-  safe_fclose (&tempfp);
+  m_fclose(&tempfp);
   header_delete(&msg);
 
   return rv;