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]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
f057003
..
f5d6d2b
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-16,6
+16,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/macros.h>
#include "mutt.h"
@@
-42,7
+43,6
@@
#include "nntp.h"
#endif
#include "nntp.h"
#endif
-#include "lib/str.h"
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
@@
-223,14
+223,14
@@
static void redraw_mix_line (LIST * chain)
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
- if (c +
str_len
(t) + 2 >= COLS - SW)
+ if (c +
m_strlen
(t) + 2 >= COLS - SW)
break;
addstr (NONULL (t));
if (chain->next)
addstr (", ");
break;
addstr (NONULL (t));
if (chain->next)
addstr (", ");
- c +=
str_len
(t) + 2;
+ c +=
m_strlen
(t) + 2;
}
}
#endif /* MIXMASTER */
}
}
#endif /* MIXMASTER */
@@
-621,7
+621,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
&& buf[0]) {
p_delete(&msg->env->newsgroups);
str_skip_trailws (buf);
&& buf[0]) {
p_delete(&msg->env->newsgroups);
str_skip_trailws (buf);
- msg->env->newsgroups =
str_dup
(str_skip_initws (buf));
+ msg->env->newsgroups =
m_strdup
(str_skip_initws (buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
@@
-639,7
+639,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
&& buf[0]) {
p_delete(&msg->env->followup_to);
str_skip_trailws (buf);
&& buf[0]) {
p_delete(&msg->env->followup_to);
str_skip_trailws (buf);
- msg->env->followup_to =
str_dup
(str_skip_initws (buf));
+ msg->env->followup_to =
m_strdup
(str_skip_initws (buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
@@
-656,7
+656,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->x_comment_to);
if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->x_comment_to);
- msg->env->x_comment_to =
str_dup
(buf);
+ msg->env->x_comment_to =
m_strdup
(buf);
move (HDR_BCC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->x_comment_to)
move (HDR_BCC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->x_comment_to)