X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fc31cece06f633567cbf4432e4ec5ab0402a5a20..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 2ba52b1e..497c868b 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -298,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
 	free (cp);
-	if (dp)
-	    free (dp);
+        mh_xfree(dp);
 
 	fclose (in);
 	return sendaux (vec, vecp, program, drft, st);
@@ -377,7 +376,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 	fclose (out);
 
 	if (!pushsw && verbsw) {
-	    printf ("\n");
+	    putchar('\n');
 	    fflush (stdout);
 	}
 
@@ -405,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    if (dp)
-	free (dp);
+    mh_xfree(dp);
 
     fclose (in);	/* close the draft */
     return status;
@@ -622,7 +620,7 @@ anno (int fd, struct stat *st)
 		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 */
@@ -701,7 +699,7 @@ annoaux (int fd)
     }
     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)
@@ -823,9 +821,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 		      errbuf);
 
 	    vec[(*vecp)++] = mh_xstrdup("-authservice");
-	    vec[(*vecp)++] = getcpy(auth_svc);
+	    vec[(*vecp)++] = mh_xstrdup(auth_svc);
 	    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");
@@ -893,10 +891,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
-    } else {
-        *message = "unable to open";
-        return NOTOK;
     }
+
+    *message = "unable to open";
+    return NOTOK;
 }