X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fsmime.c;h=d455a3a6eda75390d57b981c1529f0331b71cf32;hp=5e9fae06d1ce85a937987c61edd3524b65157859;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 5e9fae0..d455a3a 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -13,23 +13,6 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
-
-#include <lib-mime/mime.h>
-
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
-#include <lib-ui/menu.h>
-
-#include "mutt.h"
-#include "handler.h"
-#include "copy.h"
-
-
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
@@ -39,17 +22,31 @@
 #include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
-#include <locale.h>
+#  include <locale.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
+#  include <sys/time.h>
 #endif
-
 #ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
+#  include <sys/resource.h>
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
+#include "mutt.h"
+#include "alias.h"
+#include "handler.h"
+#include "copy.h"
+#include "alias.h"
 #include "crypt.h"
 
 struct smime_command_context {
@@ -258,7 +255,6 @@ static void mutt_smime_command (char *d, ssize_t dlen,
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
                      (unsigned long) cctx, 0);
-  debug_print (2, ("%s\n", d));
 }
 
 static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
@@ -1053,7 +1049,7 @@ static char *smime_extract_signer_certificate (char *infile)
 
 /* Add a certificate and update index file (externally). */
 
-void smime_invoke_import (char *infile, char *mailbox __attribute__((notused)))
+void smime_invoke_import (char *infile, char *mailbox __attribute__ ((unused)))
 {
   char tmpfname[_POSIX_PATH_MAX], *certfile = NULL, buf[STRING];
   FILE *smimein = NULL, *fpout = NULL, *fperr = NULL;