From 993e483fc8ad5afa05ae994e38312e44d638b9a1 Mon Sep 17 00:00:00 2001 From: Bertram Scharpf Date: Sat, 23 Jun 2018 18:08:08 +0200 Subject: [PATCH] Simplify the logic in mutt_addr_write_single() Remove doubled function call in nested if statement --- mutt/address.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mutt/address.c b/mutt/address.c index 12c1a4431..12f23e5cb 100644 --- a/mutt/address.c +++ b/mutt/address.c @@ -1078,23 +1078,18 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address *addr, bool { if (buflen == 0) goto done; - if ((mutt_str_strcmp(addr->mailbox, "@") != 0) && !display) + if (mutt_str_strcmp(addr->mailbox, "@") != 0) { - mutt_str_strfcpy(pbuf, addr->mailbox, buflen); - len = mutt_str_strlen(pbuf); - } - else if ((mutt_str_strcmp(addr->mailbox, "@") != 0) && display) - { - mutt_str_strfcpy(pbuf, mutt_addr_for_display(addr), buflen); + const char *a = display ? mutt_addr_for_display(addr) : addr->mailbox; + mutt_str_strfcpy(pbuf, a, buflen); len = mutt_str_strlen(pbuf); + pbuf += len; + buflen -= len; } else { *pbuf = '\0'; - len = 0; } - pbuf += len; - buflen -= len; if (addr->personal || (addr->mailbox && *addr->mailbox == '@')) { -- 2.40.0