summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2022-02-03 22:40:15 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-03 15:39:55 -0800
commita02014bb4c711db69e029e21f6ea776c4cc7f385 (patch)
tree888ad926ee4c117c127519562fd9c5373d7cc571
parentprogress.c tests: test some invalid usage (diff)
downloadtgif-a02014bb4c711db69e029e21f6ea776c4cc7f385.tar.xz
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--progress.h5
1 files changed, 2 insertions, 3 deletions
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