projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move hash.[hc] into lib-lib/
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
9b00f9e
..
889ac8a
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-14,10
+14,12
@@
#include <lib-lib/mem.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
@@
-40,9
+42,6
@@
#include "buffy.h"
#endif
#include "buffy.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <errno.h>
#include "lib/debug.h"
#include <errno.h>
@@
-215,7
+214,7
@@
int mutt_display_message (HEADER * cur)
}
/* Invoke the builtin pager */
}
/* Invoke the builtin pager */
-
memset (&info, 0, sizeof (pager_t)
);
+
p_clear(&info, 1
);
info.hdr = cur;
info.ctx = Context;
rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
info.hdr = cur;
info.ctx = Context;
rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
@@
-581,7
+580,7
@@
void mutt_enter_command (void)
return;
err.data = errbuf;
err.dsize = sizeof (errbuf);
return;
err.data = errbuf;
err.dsize = sizeof (errbuf);
-
memset (&token, 0, sizeof (token)
);
+
p_clear(&token, 1
);
r = mutt_parse_rc_line (buffer, &token, &err);
p_delete(&token.data);
if (errbuf[0]) {
r = mutt_parse_rc_line (buffer, &token, &err);
p_delete(&token.data);
if (errbuf[0]) {
@@
-860,7
+859,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
size_t l;
for (p = b->parameter; p; p = p->next) {
size_t l;
for (p = b->parameter; p; p = p->next) {
- l =
str_len
(buf);
+ l =
m_strlen
(buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);