undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wt-status: exit early using goto in wt_shortstatus_print_tracking()

Browse Source 
Deduplicate printing the line terminator by jumping to the end of the
function.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2015-10-31 18:36:01 +01:00 committed by Junio C Hamano
parent 7ca8c18950
commit bcf8cc25ac
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wt-status.c
View File

@ -1535,10 +1535,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_local, "%s", branch_name); color_fprintf(s->fp, branch_color_local, "%s", branch_name);
if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) { if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
if (!base) { if (!base)
fputc(s->null_termination ? '\0' : '\n', s->fp); goto conclude;
return;
}
upstream_is_gone = 1; upstream_is_gone = 1;
} }
@ -1548,10 +1546,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_remote, "%s", base); color_fprintf(s->fp, branch_color_remote, "%s", base);
free((char *)base); free((char *)base);
if (!upstream_is_gone && !num_ours && !num_theirs) { if (!upstream_is_gone && !num_ours && !num_theirs)
fputc(s->null_termination ? '\0' : '\n', s->fp); goto conclude;
return;
}
#define LABEL(string) (s->no_gettext ? (string) : _(string)) #define LABEL(string) (s->no_gettext ? (string) : _(string))
@ -1572,6 +1568,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
} }
color_fprintf(s->fp, header_color, "]"); color_fprintf(s->fp, header_color, "]");
conclude:
fputc(s->null_termination ? '\0' : '\n', s->fp); fputc(s->null_termination ? '\0' : '\n', s->fp);
} }