remove most of the debug code: often makes the code unreadable, for little

[apps/madmutt.git] / lib-crypt / crypt.c

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 66b8531..af29c47 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -16,22 +16,6 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
-
-#include <lib-mime/mime.h>
-
-#include "mutt.h"
-#include "handler.h"
-#include "mutt_curses.h"
-#include "copy.h"
-#include "crypt.h"
-#include "pgp.h"
-
-
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
@@ -41,17 +25,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/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+
+#include "mutt.h"
+#include "alias.h"
+#include "handler.h"
+#include "copy.h"
+#include "crypt.h"
+#include "pgp.h"
 
 /* print the current time to avoid spoofing of the signature output */
 void crypt_current_time (STATE * s, const char *app_name)
@@ -83,7 +81,7 @@ void crypt_forget_passphrase (void)
 }
 
 
-#if defined(HAVE_SETRLIMIT) && (!defined(DEBUG))
+#if defined(HAVE_SETRLIMIT)
 
 static void disable_coredumps (void)
 {
@@ -103,7 +101,7 @@ int crypt_valid_passphrase (int flags)
 {
   int ret = 0;
 
-# if defined(HAVE_SETRLIMIT) &&(!defined(DEBUG))
+# if defined(HAVE_SETRLIMIT)
   disable_coredumps ();
 # endif