Changeset 1431:f82b38f77f48 for compose.c

Timestamp:

2000-01-10 02:35:48 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add (and use) a function mutt_str_replace, which essentially
replaces the sequence:

safe_free (&s);
s = safe_strdup (t);

Files:

• compose.c (modified) (6 diffs)

compose.c

@@ -153 +153 @@
     {
       snprintf (input_signas, sizeof (input_signas), "0x%s", pgp_keyid (p));
-      safe_free((void **) &PgpSignAs);      PgpSignAs = safe_strdup (input_signas);
-      safe_free((void **) &PgpSignMicalg);  PgpSignMicalg = safe_strdup (pgp_pkalg_to_mic (p->algorithm));
+      mutt_str_replace (&PgpSignAs, input_signas);
+      mutt_str_replace (&PgpSignMicalg, pgp_pkalg_to_mic (p->algorithm));
       pgp_free_key (&p);
       
@@ -189 +189 @@
         }
         else 
-        {
-          safe_free ((void **) &PgpSignMicalg);
-          PgpSignMicalg = safe_strdup (input_micalg);
-        }
+          mutt_str_replace (&PgpSignMicalg, input_micalg);
       }
     }
@@ -488 +485 @@
         if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
         {
-          safe_free ((void **) &msg->env->subject);
-          msg->env->subject = safe_strdup (buf);
+          mutt_str_replace (&msg->env->subject, buf);
           move (HDR_SUBJECT, HDR_XOFFSET);
           clrtoeol ();
@@ -826 +822 @@
         if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0)
         {
-          safe_free ((void **) &idx[menu->current]->content->description);
-          idx[menu->current]->content->description = safe_strdup (buf);
+          mutt_str_replace (&idx[menu->current]->content->description, buf);
           menu->redraw = REDRAW_CURRENT;
         }
@@ -965 +960 @@
             break;
           
-          safe_free ((void **) &idx[menu->current]->content->filename);
-          idx[menu->current]->content->filename = safe_strdup (fname);
+          mutt_str_replace (&idx[menu->current]->content->filename, fname);
           menu->redraw = REDRAW_CURRENT;
 
@@ -1037 +1031 @@
 
           idx[menu->current]->content->type = itype;
-          safe_free ((void **) &idx[menu->current]->content->subtype);
-          idx[menu->current]->content->subtype = safe_strdup (p);
+          mutt_str_replace (&idx[menu->current]->content->subtype, p);
           idx[menu->current]->content->unlink = 1;
           menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;