Replace `if (p) free(p)' with `mh_xfree(p)'.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 2ba52b1edb5b641b2b51bf133279d8ba11feb5c6..59ebc5d26ad98c455b4fc384e586e0cdfe70afac 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -377,7 +377,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
        fclose (out);
 
        if (!pushsw && verbsw) {
        fclose (out);
 
        if (!pushsw && verbsw) {

-           printf ("\n");
+           putchar('\n');

            fflush (stdout);
        }
 
            fflush (stdout);
        }
 


@@ -622,7 +622,7 @@ anno (int fd, struct stat *st)
                advise (NULL,
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
                advise (NULL,
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)

-               cwd = getcpy (pwd ());
+               cwd = mh_xstrdup(pwd ());

 
        case OK:
            /* block a few signals */
 
        case OK:
            /* block a few signals */


@@ -701,7 +701,7 @@ annoaux (int fd)
     }
     else
        fd2 = NOTOK;
     }
     else
        fd2 = NOTOK;

-    for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++)
+    for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++)

        m_convert (mp, *ap);
     free (cp);
     if (fd2 != NOTOK)
        m_convert (mp, *ap);
     free (cp);
     if (fd2 != NOTOK)


@@ -823,9 +823,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
                      errbuf);
 
            vec[(*vecp)++] = mh_xstrdup("-authservice");
                      errbuf);
 
            vec[(*vecp)++] = mh_xstrdup("-authservice");

-           vec[(*vecp)++] = getcpy(auth_svc);
+           vec[(*vecp)++] = mh_xstrdup(auth_svc);

            vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");
            vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");

-           vec[(*vecp)++] = getcpy(mh_oauth_cred_fn(auth_svc));
+           vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc));

            vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
            vec[(*vecp)++] = getcpy(svc.client_id);
            vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");
            vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
            vec[(*vecp)++] = getcpy(svc.client_id);
            vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");


@@ -893,10 +893,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
         fclose(in);
 
         return OK;

-    } else {
-        *message = "unable to open";
-        return NOTOK;

     }
     }

+
+    *message = "unable to open";
+    return NOTOK;

 }
 
 
 }