#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.
{
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));
}
/*
struct pgp_command_context cctx;
char cmd[HUGE_STRING];
- memset (&cctx, 0, sizeof (cctx));
+ p_clear(&cctx, 1);
if (!format || !*format)
return (pid_t) - 1;
char cmd[HUGE_STRING];
struct pgp_command_context cctx;
- memset (&cctx, 0, sizeof (cctx));
+ p_clear(&cctx, 1);
mutt_quote_filename (_fname, sizeof (_fname), fname);
cctx.fname = _fname;
if (!PgpGetkeysCommand)
return;
- memset (&cctx, 0, sizeof (cctx));
+ p_clear(&cctx, 1);
personal = addr->personal;
addr->personal = NULL;