From: René Scharfe <l.s.r@web.de>
Date: Sat, 8 Jul 2017 10:51:01 +0000 (+0200)
Subject: wt-status: use separate variable for result of shorten_unambiguous_ref
X-Git-Tag: v2.14.0-rc0~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e8d2729ae64483efd5e8663cbc9d476364fb472?ds=inline;hp=--cc

wt-status: use separate variable for result of shorten_unambiguous_ref

Store the pointer to the string allocated by shorten_unambiguous_ref in
a dedicated variable, short_base, and keep base unchanged.  A non-const
variable is more appropriate for such an object.  It avoids having to
cast const away on free and stops redefining the meaning of base, making
the code slightly clearer.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

5e8d2729ae64483efd5e8663cbc9d476364fb472
diff --git a/wt-status.c b/wt-status.c
index 068de38b51..fd863c81fc 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1735,6 +1735,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
 	const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
 
 	const char *base;
+	char *short_base;
 	const char *branch_name;
 	int num_ours, num_theirs;
 	int upstream_is_gone = 0;
@@ -1769,10 +1770,10 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
 		upstream_is_gone = 1;
 	}
 
-	base = shorten_unambiguous_ref(base, 0);
+	short_base = shorten_unambiguous_ref(base, 0);
 	color_fprintf(s->fp, header_color, "...");
-	color_fprintf(s->fp, branch_color_remote, "%s", base);
-	free((char *)base);
+	color_fprintf(s->fp, branch_color_remote, "%s", short_base);
+	free(short_base);
 
 	if (!upstream_is_gone && !num_ours && !num_theirs)
 		goto conclude;