projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use m_strdup and m_strlen that are inlined for efficiency
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
95a7d1d
..
52fe118
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-12,6
+12,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
@@
-38,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>
@@
-273,7
+274,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
-
mem_free
(&err);
+
p_delete
(&err);
rfc822_free_address (&adr);
return;
}
rfc822_free_address (&adr);
return;
}
@@
-581,7
+582,7
@@
void mutt_enter_command (void)
err.dsize = sizeof (errbuf);
memset (&token, 0, sizeof (token));
r = mutt_parse_rc_line (buffer, &token, &err);
err.dsize = sizeof (errbuf);
memset (&token, 0, sizeof (token));
r = mutt_parse_rc_line (buffer, &token, &err);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
@@
-858,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);
@@
-871,7
+872,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
-
mem_free
(&b->subtype);
+
p_delete
(&b->subtype);
mutt_parse_content_type (buf, b);
mutt_parse_content_type (buf, b);