Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8

[git.git] / progress.h

diff --git a/progress.h b/progress.h
index 5ae1a89e5a4669553e44d5bd0cc339c308c60c0f..611e4c4d42d8d1164add09f926ad5b2ce088db5e 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -1,21 +1,14 @@
 #ifndef PROGRESS_H
 #define PROGRESS_H
 
-struct progress {
-       const char *prefix;
-       unsigned total;
-       unsigned last_percent;
-       unsigned delay;
-       unsigned delayed_percent_treshold;
-       const char *delayed_title;
-};
+struct progress;
 
+void display_throughput(struct progress *progress, off_t total);
 int display_progress(struct progress *progress, unsigned n);
-void start_progress(struct progress *progress, const char *title,
-                   const char *prefix, unsigned total);
-void start_progress_delay(struct progress *progress, const char *title,
-                         const char *prefix, unsigned total,
-                         unsigned percent_treshold, unsigned delay);
-void stop_progress(struct progress *progress);
+struct progress *start_progress(const char *title, unsigned total);
+struct progress *start_progress_delay(const char *title, unsigned total,
+                                      unsigned percent_treshold, unsigned delay);
+void stop_progress(struct progress **progress);
+void stop_progress_msg(struct progress **progress, const char *msg);
 
 #endif