};
#endif
-static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) {
+
+static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
int w=(COLS-SW)>blen?blen:COLS-SW;
mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
return (src);
}
-static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu,
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
ATTACHPTR **idx = NULL;
short idxlen = 0;
short idxmax = 0;
- int i, close = 0;
+ int i, closed = 0;
int r = -1; /* return value */
int op = 0;
int loop = 1;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->newsgroups);
- str_skip_trailws (buf);
- msg->env->newsgroups = m_strdup(vskipspaces(buf));
+ m_strrtrim(buf);
+ msg->env->newsgroups = m_strdup(skipspaces(buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->followup_to);
- str_skip_trailws (buf);
- msg->env->followup_to = m_strdup(vskipspaces(buf));
+ m_strrtrim(buf);
+ msg->env->followup_to = m_strdup(skipspaces(buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
- char *err = NULL;
+ const char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
set_option (OPTATTACHMSG);
mutt_message _("Tag the messages you want to attach!");
- close = mutt_index_menu ();
+ closed = mutt_index_menu ();
unset_option (OPTATTACHMSG);
if (!Context) {
}
menu->redraw |= REDRAW_FULL;
- if (close == OP_QUIT)
+ if (closed == OP_QUIT)
mx_close_mailbox (Context, NULL);
else
mx_fastclose_mailbox (Context);