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

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 99851d92a71a95c34bdc7020a6785adb25179394..285ced5dd5ae3c177e6f2a1a658bcff6cb7fd57c 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -62,7 +62,7 @@ static char localmbox[BUFSIZ];
  * MTS specific variables
  */
 static char *mts_method = "smtp";
  * MTS specific variables
  */
 static char *mts_method = "smtp";

-int  sm_mts    = MTS_SENDMAIL_SMTP;
+int  sm_mts    = MTS_SMTP;

 char *sendmail = SENDMAILPATH;
 
 /*
 char *sendmail = SENDMAILPATH;
 
 /*


@@ -135,12 +135,11 @@ save_mts_method (const char *value) {
  */
 
 void
  */
 
 void

-mts_init (char *name)
+mts_init (void)

 {
     const char *cp;
     FILE *fp;
     static int inited = 0;
 {
     const char *cp;
     FILE *fp;
     static int inited = 0;

-    NMH_UNUSED (name);

 
     if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
        return;
 
     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];
     int i, r;
     char *bp;
     char buffer[BUFSIZ];

-    size_t len;

 
     for (bp = buffer; *s; bp++, s++) {
        if (*s != QUOTE) {
 
     for (bp = buffer; *s; bp++, s++) {
        if (*s != QUOTE) {


@@ -204,11 +202,7 @@ tailor_value (char *s)
     }
     *bp = 0;
 
     }
     *bp = 0;
 

-    len = strlen (buffer) + 1;
-    bp = mh_xmalloc (len);
-    memcpy (bp, buffer, len);
-
-    return bp;
+    return mh_xstrdup(buffer);

 }
 
 /*
 }
 
 /*


@@ -236,7 +230,7 @@ LocalName (int flag)
     if (buf[0])
        return buf;
 
     if (buf[0])
        return buf;
 

-    mts_init ("mts");
+    mts_init ();

 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {
 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {


@@ -283,7 +277,7 @@ SystemName (void)
     if (buffer[0])
        return buffer;
 
     if (buffer[0])
        return buffer;
 

-    mts_init ("mts");
+    mts_init ();

 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {
 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {