X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0815d3444144959a66b8fd8e97258158cabd07b5..45c8aa2f011526190e135e20cc61bdbac30e89e3:/sbr/mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 99851d92..9db81061 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -62,7 +62,7 @@ static char localmbox[BUFSIZ];
  * MTS specific variables
  */
 static char *mts_method = "smtp";
-int  sm_mts    = MTS_SENDMAIL_SMTP;
+int  sm_mts    = MTS_SMTP;
 char *sendmail = SENDMAILPATH;
 
 /*
@@ -135,12 +135,11 @@ save_mts_method (const char *value) {
  */
 
 void
-mts_init (char *name)
+mts_init (void)
 {
     const char *cp;
     FILE *fp;
     static int inited = 0;
-    NMH_UNUSED (name);
 
     if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
 	return;
@@ -171,7 +170,6 @@ tailor_value (char *s)
     int i, r;
     char *bp;
     char buffer[BUFSIZ];
-    size_t len;
 
     for (bp = buffer; *s; bp++, s++) {
 	if (*s != QUOTE) {
@@ -184,6 +182,7 @@ tailor_value (char *s)
 		case 't': *bp = '\t'; break;
 
 		case 0: s--;
+		    /* FALLTHRU */
 		case QUOTE: 
 		    *bp = QUOTE;
 		    break;
@@ -204,11 +203,7 @@ tailor_value (char *s)
     }
     *bp = 0;
 
-    len = strlen (buffer) + 1;
-    bp = mh_xmalloc (len);
-    memcpy (bp, buffer, len);
-
-    return bp;
+    return mh_xstrdup(buffer);
 }
 
 /*
@@ -236,7 +231,7 @@ LocalName (int flag)
     if (buf[0])
 	return buf;
 
-    mts_init ("mts");
+    mts_init ();
 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {
@@ -283,7 +278,7 @@ SystemName (void)
     if (buffer[0])
 	return buffer;
 
-    mts_init ("mts");
+    mts_init ();
 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {