aboutsummaryrefslogtreecommitdiff
path: root/imap-send.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:23 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:23 -0700
commit334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1 (patch)
tree56815247fc4394a10638a269cad009efa8655811 /imap-send.c
parentc8fd2201756f9cd10a796311a1b25d7a2ab2a3b9 (diff)
parent13092a916d7b8211fd828a6a7ee0d3cefff995e1 (diff)
downloadgit-334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1.tar.gz
git-334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1.tar.xz
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()
Diffstat (limited to 'imap-send.c')
-rw-r--r--imap-send.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/imap-send.c b/imap-send.c
index adb9738c3..5c7e27a89 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1082,10 +1082,8 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
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);