From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:23 +0000 (-0700)
Subject: Merge branch 'jc/cocci-xstrdup-or-null' into maint
X-Git-Tag: v2.10.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1?ds=inline;hp=-c

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()
---

334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1
diff --combined imap-send.c
index adb9738c30,9514ddc565..5c7e27a894
--- a/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, '/');