automatic commit

[folded-ctf.git] / progress_bar.cc

diff --git a/progress_bar.cc b/progress_bar.cc
index 67370a9..50a4d16 100644 (file)
--- a/progress_bar.cc
+++ b/progress_bar.cc
@@ -21,8 +21,6 @@
 #include <time.h>
 #include "progress_bar.h"
 
-const int ProgressBar::_width = 80;
-
 ProgressBar::ProgressBar()  : _visible(false), _value_max(-1) { }
 
 void ProgressBar::set_visible(bool visible) {
@@ -41,7 +39,7 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
     int step = int((value * 40) / _value_max);
 
     if(1 || step > _last_step) {
-      char buffer[_width + 1], date_buffer[buffer_size];
+      char buffer[width + 1], date_buffer[buffer_size];
       int i, j;
       j = sprintf(buffer, "Timer: ");
 
@@ -58,19 +56,19 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
           time(&current);
           current += rt;
           strftime(date_buffer, buffer_size, "%a %b %e %H:%M", localtime(&current));
-          j += snprintf(buffer + j, _width - j - 1, " (end ~ %s)", date_buffer);
+          j += snprintf(buffer + j, width - j - 1, " (end ~ %s)", date_buffer);
         } else {
           int hours = rt/3600, min = (rt%3600)/60, sec = rt%60;
           if(hours > 0)
-            j += snprintf(buffer + j, _width - j - 1, " (~%dh%dmin left)", hours, min);
+            j += snprintf(buffer + j, width - j - 1, " (~%dh%dmin left)", hours, min);
           else if(min > 0)
-            j += snprintf(buffer + j, _width - j - 1, " (~%dmin%ds left)", min, sec);
+            j += snprintf(buffer + j, width - j - 1, " (~%dmin%ds left)", min, sec);
           else
-            j += snprintf(buffer + j, _width - j - 1, " (~%ds left)", sec);
+            j += snprintf(buffer + j, width - j - 1, " (~%ds left)", sec);
         }
       }
 
-      for(; j < _width; j++) buffer[j] = ' ';
+      for(; j < width; j++) buffer[j] = ' ';
       buffer[j] = '\0';
       (*out) << buffer << "\r";
       out->flush();
@@ -81,13 +79,13 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
 
 void ProgressBar::finish(ostream *out) {
   if(_visible) {
-    char buffer[_width + 1];
+    char buffer[width + 1];
     int j;
     time_t current_time; time(&current_time);
     int rt = int(current_time - _initial_time);
     int min = rt/60, sec = rt%60;
     j = sprintf(buffer, "Timer: Total %dmin%ds", min, sec);
-    for(; j < _width; j++) buffer[j] = ' ';
+    for(; j < width; j++) buffer[j] = ' ';
     buffer[j] = '\0';
     (*out) << buffer << endl;
     out->flush();