From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 9 Feb 2020 02:18:37 +0000 (+0000)
Subject: smtp: Tidy up, following recent changes, to maintain the coding style
X-Git-Tag: curl-7_69_0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8220ec82196f8331460f68b676b7aea6d9e3e806;p=thirdparty%2Fcurl.git

smtp: Tidy up, following recent changes, to maintain the coding style

Closes #4892
---

diff --git a/lib/smtp.c b/lib/smtp.c
index b3b1e83ed1..a87e6126ad 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -566,10 +566,7 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
   bool utf8 = FALSE;
 
   /* Calculate the FROM parameter */
-  if(!data->set.str[STRING_MAIL_FROM])
-    /* Null reverse-path, RFC-5321, sect. 3.6.3 */
-    from = strdup("<>");
-  else {
+  if(data->set.str[STRING_MAIL_FROM]) {
     char *address = NULL;
     struct hostname host = { NULL, NULL, NULL, NULL };
 
@@ -598,6 +595,9 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
 
     free(address);
   }
+  else
+    /* Null reverse-path, RFC-5321, sect. 3.6.3 */
+    from = strdup("<>");
 
   if(!from)
     return CURLE_OUT_OF_MEMORY;