[PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref

[PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref

[René Scharfe]

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>
---
 wt-status.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wt-status.c b/wt-status.c
index 8d2fb35b08..77c27c5113 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1763,6 +1763,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;
@@ -1797,10 +1798,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;
-- 
2.13.2

Re: [PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref

[Stefan Beller]

On Sat, Jul 8, 2017 at 3:51 AM, René Scharfe <l.s.r@web.de> wrote:
> 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>

Thanks,
Reviewed-by: Stefan Beller <sbeller@google.com>

> ---
>  wt-status.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index 8d2fb35b08..77c27c5113 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1763,6 +1763,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;
> @@ -1797,10 +1798,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;
> --
> 2.13.2
>