X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/63b392df15cd72df5c95e8649e93d6b15eb38411..98c2e7d95bda262ef23e8f0838e5b86d08ed4e4f:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 70c16df1..0e3baae4 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -452,7 +452,7 @@ usr_delivery (int fd, char *delivery, int su)
 	if (*buffer == '#' || *buffer == '\n')
 	    continue;
 
-        TrimSuffixC(buffer, '\n');
+        trim_suffix_c(buffer, '\n');
 
 	/* split buffer into fields */
 	vecp = split (buffer, vec);
@@ -735,7 +735,7 @@ parse (int fd)
 	switch (state = m_getfld (&gstate, name, field, &fieldsz, in)) {
 	    case FLD: 
 	    case FLDPLUS: 
-		lp = add (field, NULL);
+		lp = mh_xstrdup(field);
 		while (state == FLDPLUS) {
 		    fieldsz = sizeof field;
 		    state = m_getfld (&gstate, name, field, &fieldsz, in);
@@ -1253,7 +1253,7 @@ you_lose:
     while (fgets (buffer, sizeof(buffer), qfp)) {
 	if (first) {
 	    first = 0;
-	    if (HasPrefix(buffer, "From ")) {
+	    if (has_prefix(buffer, "From ")) {
 		/* get copy of envelope information ("From " line) */
 		envelope = mh_xstrdup(buffer);
 
@@ -1337,7 +1337,7 @@ verbose_printf (char *fmt, ...)
     va_list ap;
 
     va_start(ap, fmt);
-    vfprintf (stdout, fmt, ap);
+    vprintf(fmt, ap);
     va_end(ap);
 
     fflush (stdout);	/* now flush output */
@@ -1357,19 +1357,19 @@ adorn (char *what, char *fmt, ...)
     char *s;
 
     eindex = errno;	/* save the errno */
-    fprintf (stdout, ", ");
+    printf(", ");
 
     va_start(ap, fmt);
-    vfprintf (stdout, fmt, ap);
+    vprintf(fmt, ap);
     va_end(ap);
 
     if (what) {
 	if (*what)
-	    fprintf (stdout, " %s: ", what);
+	    printf(" %s: ", what);
 	if ((s = strerror (eindex)))
-	    fprintf (stdout, "%s", s);
+	    fputs(s, stdout);
 	else
-	    fprintf (stdout, "Error %d", eindex);
+	    printf("Error %d", eindex);
     }
 
     putchar('\n');
@@ -1432,7 +1432,7 @@ suppress_duplicates (int fd, char *file)
 		    continue;
 		}
 
-		cp = add (buf, NULL);
+		cp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
 		    state = m_getfld (&gstate, name, buf, &bufsz, in);