From: Ævar Arnfjörð Bjarmason Date: Thu, 3 Feb 2022 21:40:15 +0000 (+0100) Subject: progress.h: format and be consistent with progress.c naming X-Git-Tag: v2.36.0-rc0~113^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a02014bb4c711db69e029e21f6ea776c4cc7f385;p=thirdparty%2Fgit.git progress.h: format and be consistent with progress.c naming Fix an inconsistency introduced in dc6a0757c4f (make struct progress an opaque type, 2007-10-30) and rename the "progress" parameters to stop_progress{,_msg}() to "p_progress". Now these match the corresponding parameters in the *.c code. While we're at it let's move the definition of the former below the latter, a subsequent change will start defining stop_progress() in terms of stop_progress_msg(). Let's also remove the excess whitespace at the end of the file. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/progress.h b/progress.h index f1913acf73..4f6806904a 100644 --- a/progress.h +++ b/progress.h @@ -18,7 +18,6 @@ struct progress *start_sparse_progress(const char *title, uint64_t total); struct progress *start_delayed_progress(const char *title, uint64_t total); struct progress *start_delayed_sparse_progress(const char *title, uint64_t total); -void stop_progress(struct progress **progress); -void stop_progress_msg(struct progress **progress, const char *msg); - +void stop_progress_msg(struct progress **p_progress, const char *msg); +void stop_progress(struct progress **p_progress); #endif