[PATCHv2] branch.c: simplify chain of if statements
- From
- Dragos Foianu <dragos.foianu@gmail.com>
- Date
- Mar 17, 2014, 15:51 UTC
- Message-ID
- <1395071493-31435-1-git-send-email-dragos.foianu@gmail.com>
This patch uses a table to store the different messages that can be emitted by the verbose install_branch_config function. It computes an index based on the three flags and prints the message located at the specific index in the table of messages. If the index somehow is not within the table, we have a bug.
Signed-off-by: Dragos Foianu <dragos.foianu@gmail.com> --- branch.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/branch.c b/branch.c index 723a36b..95645d5 100644 --- a/branch.c +++ b/branch.c @@ -54,6 +54,18 @@ void install_branch_config(int flag, const char *local, const char *origin, cons struct strbuf key = STRBUF_INIT; int rebasing = should_setup_rebase(origin); + const char *messages[] = { + N_("Branch %s set up to track local ref %s."), + N_("Branch %s set up to track remote ref %s."), + N_("Branch %s set up to track local branch %s."), + N_("Branch %s set up to track remote branch %s from %s."), + N_("Branch %s set up to track local ref %s by rebasing."), + N_("Branch %s set up to track remote ref %s by rebasing."), + N_("Branch %s set up to track local branch %s by rebasing."), + N_("Branch %s set up to track remote branch %s from %s by rebasing.") + }; + int index = 0; + if (remote_is_branch && !strcmp(local, shortname) && !origin) { @@ -76,28 +88,22 @@ void install_branch_config(int flag, const char *local, const char *origin, cons } strbuf_release(&key); + if (origin) + index += 1; + if (remote_is_branch) + index += 2; + if (rebasing) + index += 4; + if (flag & BRANCH_CONFIG_VERBOSE) { if (remote_is_branch && origin) - printf_ln(rebasing ? - _("Branch %s set up to track remote branch %s from %s by rebasing.") : - _("Branch %s set up to track remote branch %s from %s."), - local, shortname, origin); - else if (remote_is_branch && !origin) - printf_ln(rebasing ? - _("Branch %s set up to track local branch %s by rebasing.") : - _("Branch %s set up to track local branch %s."), - local, shortname); - else if (!remote_is_branch && origin) - printf_ln(rebasing ? - _("Branch %s set up to track remote ref %s by rebasing.") : - _("Branch %s set up to track remote ref %s."), - local, remote); - else if (!remote_is_branch && !origin) - printf_ln(rebasing ? - _("Branch %s set up to track local ref %s by rebasing.") : - _("Branch %s set up to track local ref %s."), - local, remote); + printf_ln(_(messages[index]), + local, shortname, origin); else + printf_ln(_(messages[index]), + local, (!remote_is_branch) ? remote : shortname); + + if (index < 0 || index > sizeof(messages) / sizeof(*messages)) die("BUG: impossible combination of %d and %p", remote_is_branch, origin); }
-- 1.8.3.2