Merge branch 'jc/cocci-xstrdup-or-null' into maint

Code cleanup.

* jc/cocci-xstrdup-or-null:
cocci: refactor common patterns to use xstrdup_or_null()

diff --combined imap-send.c
index adb9738c308f70190f6c3996d5781e6fbc4dea3f,9514ddc56524cbcd1add757a04f4b42fb2489662..5c7e27a89459a9a63018cc469262c82891c6f7b7
--- 1/imap-send.c
--- 2/imap-send.c
+++ b/imap-send.c
@@@ -1082,10 -1082,8 +1082,8 @@@ static struct imap_store *imap_open_sto
                        cred.protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
                        cred.host = xstrdup(srvc->host);
  
-                       if (srvc->user)
-                               cred.username = xstrdup(srvc->user);
-                       if (srvc->pass)
-                               cred.password = xstrdup(srvc->pass);
+                       cred.username = xstrdup_or_null(srvc->user);
+                       cred.password = xstrdup_or_null(srvc->pass);
  
                        credential_fill(&cred);
  
@@@ -1410,7 -1408,6 +1408,7 @@@ static CURL *setup_curl(struct imap_ser
        curl_easy_setopt(curl, CURLOPT_USERNAME, server.user);
        curl_easy_setopt(curl, CURLOPT_PASSWORD, server.pass);
  
 +      strbuf_addstr(&path, server.use_ssl ? "imaps://" : "imap://");
        strbuf_addstr(&path, server.host);
        if (!path.len || path.buf[path.len - 1] != '/')
                strbuf_addch(&path, '/');