projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit str_cmp enters m_strcmp
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
f4f5aa6
..
d63c146
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-13,9
+13,11
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
@@
-31,8
+33,6
@@
#endif
#include "mutt_crypt.h"
#endif
#include "mutt_crypt.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-511,7
+511,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
int rv = -1;
STATE s;
int rv = -1;
STATE s;
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
@@
-611,7
+611,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
- b->d_filename =
str_dup
(b->filename);
+ b->d_filename =
m_strdup
(b->filename);
}
else {
/* avoid Content-Disposition: header with temporary filename */
}
else {
/* avoid Content-Disposition: header with temporary filename */