Don't `else' after return. Simplify control flow.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index e9ed4fc91197a5c710c1bfa41f1fc6c90784cb3c..e5a9f459aba56968e6b21073927229202960f648 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -830,7 +830,7 @@ replace_boundary (CT ct, char *file, char *boundary) {
             continue;
 
         case BODY:
             continue;
 
         case BODY:

-            fputs ("\n", fpout);
+            putc('\n', fpout);

             /* buf will have a terminating NULL, skip it. */
             if ((int) fwrite (buf, 1, bufsz-1, fpout) < bufsz-1) {
                 advise (file, "fwrite");
             /* buf will have a terminating NULL, skip it. */
             if ((int) fwrite (buf, 1, bufsz-1, fpout) < bufsz-1) {
                 advise (file, "fwrite");


@@ -924,10 +924,10 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) {
                            * c_ctline
                            */
                         /* Extract type and subtype from type/subtype. */
                            * c_ctline
                            */
                         /* Extract type and subtype from type/subtype. */

-                        ct_type = getcpy (ct_type_subtype);
+                        ct_type = mh_xstrdup(ct_type_subtype);

                         if ((cp = strchr (ct_type, '/'))) {
                             *cp = '\0';
                         if ((cp = strchr (ct_type, '/'))) {
                             *cp = '\0';

-                            ct_subtype = getcpy (++cp);
+                            ct_subtype = mh_xstrdup(++cp);

                         } else {
                             advise (NULL, "missing / in MIME type of %s %s",
                                     ct->c_file, ct->c_partno);
                         } else {
                             advise (NULL, "missing / in MIME type of %s %s",
                                     ct->c_file, ct->c_partno);


@@ -991,7 +991,7 @@ replace_substring (char **str, const char *old, const char *new) {
         char *prefix, *new_str;
 
         if (cp - *str) {
         char *prefix, *new_str;
 
         if (cp - *str) {

-            prefix = getcpy (*str);
+            prefix = mh_xstrdup(*str);

             *(prefix + (cp - *str)) = '\0';
             new_str = concat (prefix, new, remainder, NULL);
             free (prefix);
             *(prefix + (cp - *str)) = '\0';
             new_str = concat (prefix, new, remainder, NULL);
             free (prefix);


@@ -1277,7 +1277,7 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
                         HF hf;
 
                         parent->c_subtype = MULTI_ALTERNATE;
                         HF hf;
 
                         parent->c_subtype = MULTI_ALTERNATE;

-                        parent->c_ctinfo.ci_subtype = getcpy ("alternative");
+                        parent->c_ctinfo.ci_subtype = mh_xstrdup("alternative");

                         if (! replace_substring (&parent->c_ctline, "/related",
                                                  "/alternative")) {
                             advise (NULL,
                         if (! replace_substring (&parent->c_ctline, "/related",
                                                  "/alternative")) {
                             advise (NULL,


@@ -1540,10 +1540,10 @@ copy_ctinfo (CI dest, CI src) {
        d_pm = add_param(&dest->ci_first_pm, &dest->ci_last_pm, s_pm->pm_name,
                         s_pm->pm_value, 0);
        if (s_pm->pm_charset) {
        d_pm = add_param(&dest->ci_first_pm, &dest->ci_last_pm, s_pm->pm_name,
                         s_pm->pm_value, 0);
        if (s_pm->pm_charset) {

-           d_pm->pm_charset = getcpy(s_pm->pm_charset);
+           d_pm->pm_charset = mh_xstrdup(s_pm->pm_charset);

         }
        if (s_pm->pm_lang) {
         }
        if (s_pm->pm_lang) {

-           d_pm->pm_lang = getcpy(s_pm->pm_lang);
+           d_pm->pm_lang = mh_xstrdup(s_pm->pm_lang);

         }
     }
 
         }
     }