# [PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref 2 messages from 2017-07-08 to 2017-07-10. Participants: René Scharfe, Stefan Beller. Thread: https://gitlist.dev/t/46332 ## René Scharfe, 2017-07-08 10:51 Subject: [PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref Message-ID: URL: https://gitlist.dev/e/d70bf87c-f8b3-9f02-14bd-b3ceb5e9f7e4%40web.de ``` 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 --- 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 ``` ## Stefan Beller, 2017-07-10 02:51 Subject: Re: [PATCH] wt-status: use separate variable for result of shorten_unambiguous_ref Message-ID: URL: https://gitlist.dev/e/CAGZ79kZgJpLttFOT01XOD-dj8Ag6A_1kkwGngbH2MMaO%3D_F-NA%40mail.gmail.com In-Reply-To: ``` On Sat, Jul 8, 2017 at 3:51 AM, René Scharfe 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 Thanks, Reviewed-by: Stefan Beller > --- > 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 > ```