mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status: refactor null_termination option

Browse Source 
This option is passed separately to the wt_status printing
functions, whereas every other formatting option is
contained in the wt_status struct itself. Let's do the same
here, so we can avoid passing it around through the call
stack.

Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Jeff King
2012-05-07 15:44:44 -04:00
parent 036dbbfb2d
commit 3207a3a291
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wt-status.c
View File

@ -777,7 +777,7 @@ void wt_status_print(struct wt_status *s)
}
}
static void wt_shortstatus_unmerged(int null_termination, struct string_list_item *it,
static void wt_shortstatus_unmerged(struct string_list_item *it,
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
@ -793,7 +793,7 @@ static void wt_shortstatus_unmerged(int null_termination, struct string_list_ite
case 7: how = "UU"; break; /* both modified */
}
color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
if (null_termination) {
if (s->null_termination) {
fprintf(stdout, " %s%c", it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
@ -804,7 +804,7 @@ static void wt_shortstatus_unmerged(int null_termination, struct string_list_ite
}
}
static void wt_shortstatus_status(int null_termination, struct string_list_item *it,
static void wt_shortstatus_status(struct string_list_item *it,
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
@ -818,7 +818,7 @@ static void wt_shortstatus_status(int null_termination, struct string_list_item
else
putchar(' ');
putchar(' ');
if (null_termination) {
if (s->null_termination) {
fprintf(stdout, "%s%c", it->string, 0);
if (d->head_path)
fprintf(stdout, "%s%c", d->head_path, 0);
@ -846,10 +846,10 @@ static void wt_shortstatus_status(int null_termination, struct string_list_item
}
}
static void wt_shortstatus_other(int null_termination, struct string_list_item *it,
static void wt_shortstatus_other(struct string_list_item *it,
struct wt_status *s, const char *sign)
{
if (null_termination) {
if (s->null_termination) {
fprintf(stdout, "%s %s%c", sign, it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
@ -917,7 +917,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf_ln(s->fp, header_color, "]");
}
void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_branch)
void wt_shortstatus_print(struct wt_status *s, int show_branch)
{
int i;
@ -931,28 +931,28 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_br
it = &(s->change.items[i]);
d = it->util;
if (d->stagemask)
wt_shortstatus_unmerged(null_termination, it, s);
wt_shortstatus_unmerged(it, s);
else
wt_shortstatus_status(null_termination, it, s);
wt_shortstatus_status(it, s);
}
for (i = 0; i < s->untracked.nr; i++) {
struct string_list_item *it;
it = &(s->untracked.items[i]);
wt_shortstatus_other(null_termination, it, s, "??");
wt_shortstatus_other(it, s, "??");
}
for (i = 0; i < s->ignored.nr; i++) {
struct string_list_item *it;
it = &(s->ignored.items[i]);
wt_shortstatus_other(null_termination, it, s, "!!");
wt_shortstatus_other(it, s, "!!");
}
}
void wt_porcelain_print(struct wt_status *s, int null_termination)
void wt_porcelain_print(struct wt_status *s)
{
s->use_color = 0;
s->relative_paths = 0;
s->prefix = NULL;
wt_shortstatus_print(s, null_termination, 0);
wt_shortstatus_print(s, 0);
}