X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=09acea2a04042bd732e64b3bcaf9120b34c990b3;hp=3d5f39c42f146a23f22218b8b136c1f6b68986d8;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/compose.c b/compose.c
index 3d5f39c..09acea2 100644
--- a/compose.c
+++ b/compose.c
@@ -134,7 +134,8 @@ static struct mapping_t ComposeNewsHelp[] = {
 };
 #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]),
@@ -501,7 +502,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op,
   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);
@@ -527,7 +528,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
   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;
@@ -622,8 +623,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         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)
@@ -640,8 +641,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         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)
@@ -673,7 +674,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       else
         buf[0] = 0;
       if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) {
-        str_replace (&msg->env->subject, buf);
+        m_strreplace(&msg->env->subject, buf);
         move (HDR_SUBJECT, HDR_XOFFSET + SW);
         clrtoeol ();
         if (msg->env->subject)
@@ -712,7 +713,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           (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,
@@ -906,7 +907,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         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) {
@@ -940,7 +941,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         menu->redraw |= REDRAW_FULL;
 
-        if (close == OP_QUIT)
+        if (closed == OP_QUIT)
           mx_close_mailbox (Context, NULL);
         else
           mx_fastclose_mailbox (Context);
@@ -1002,7 +1003,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                NONULL(idx[menu->current]->content->description));
       /* header names should not be translated */
       if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) {
-        str_replace (&idx[menu->current]->content->description, buf);
+        m_strreplace(&idx[menu->current]->content->description, buf);
         menu->redraw = REDRAW_CURRENT;
       }
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
@@ -1150,7 +1151,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (mutt_rename_file (idx[menu->current]->content->filename, fname))
           break;
 
-        str_replace (&idx[menu->current]->content->filename, fname);
+        m_strreplace(&idx[menu->current]->content->filename, fname);
         menu->redraw = REDRAW_CURRENT;
 
         if (idx[menu->current]->content->stamp >= st.st_mtime)
@@ -1212,7 +1213,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         update_idx (menu, idx, idxlen++);
 
         idx[menu->current]->content->type = itype;
-        str_replace (&idx[menu->current]->content->subtype, p);
+        m_strreplace(&idx[menu->current]->content->subtype, p);
         idx[menu->current]->content->unlink = 1;
         menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;