progress.c: use dereferenced "progress" variable, not "(*p_progress)"

Since 98a1364740 (trace2: log progress time and throughput,
2020-05-12) stop_progress() dereferences a "struct progress **"
parameter in several places. Extract a dereferenced variable to reduce
clutter and make it clearer who needs to write to this parameter.

Now instead of using "*p_progress" several times in stop_progress() we
check it once for NULL and then use a dereferenced "progress" variable
thereafter. This uses the same pattern as the adjacent
stop_progress_msg() function, see ac900fddb7 (progress: don't
dereference before checking for NULL, 2020-08-10).

Signed-off-by: Ævar Arnfjörð Bjarmason <>
Signed-off-by: Junio C Hamano <>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-02-03 22:40:16 +01:00 committed by Junio C Hamano
parent a02014bb4c
commit 1ccad6a1f1
1 changed files with 9 additions and 6 deletions

View File

@ -319,21 +319,24 @@ static void finish_if_sparse(struct progress *progress)
void stop_progress(struct progress **p_progress)
struct progress *progress;
if (!p_progress)
BUG("don't provide NULL to stop_progress");
progress = *p_progress;
if (*p_progress) {
if (progress) {
trace2_data_intmax("progress", the_repository, "total_objects",
if ((*p_progress)->throughput)
if (progress->throughput)
trace2_data_intmax("progress", the_repository,
trace2_region_leave("progress", (*p_progress)->title, the_repository);
trace2_region_leave("progress", progress->title, the_repository);
stop_progress_msg(p_progress, _("done"));