use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / pgpinvoke.c

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 91d2b00..9953406 100644 (file)
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -25,15 +25,17 @@
 #include <fcntl.h>
 #include <time.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "pgp.h"
 #include "rfc822.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include "lib/debug.h"
 
 /*
  * The actual command line formatter.
@@ -139,7 +141,7 @@ void mutt_pgp_command (char *d, size_t dlen, struct pgp_command_context *cctx,
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
                      (unsigned long) cctx, 0);
-  dprint (2, (debugfile, "mutt_pgp_command: %s\n", d));
+  debug_print (2, ("%s\n", d));
 }
 
 /*