Changeset 2374 in MondoRescue

Timestamp:

Sep 8, 2009, 8:04:07 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Try to fix garbled screen progression in text mode based on 2.2.10 modifications which are working

File:

• branches/2.2.9/mondo/src/common/newt-specific.c (modified) (5 diffs)

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -1032 +1032 @@
             sprintf(timeline_str,
                     "%2ld:%02ld taken            %2ld:%02ld remaining",
-                    time_taken / 60, time_taken % 60, time_remaining / 60,
-                    time_remaining % 60);
+                    (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60,
+                    (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(&pcline_str, " Working");
@@ -1057 +1057 @@
                 if (percentage >= 3) {
                     mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
-                            time_remaining / 60, time_remaining % 60);
+                            (long) time_remaining / 60, (long) time_remaining % 60);
                     printf("---evalcall---1--- %s\n",
                            g_isoform_header_str);
@@ -1123 +1123 @@
      update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
         /*@ long ***************************************************** */
-        long current_time = 0;
-        long time_taken = 0;
-        long time_remaining = 0;
-        long time_total_est = 0;
+        long current_time = 0L;
+        long time_taken = 0L;
+        long time_remaining = 0L;
+        long time_total_est = 0L;
 
         /*@ int ******************************************************* */
@@ -1179 +1179 @@
             time_remaining = time_total_est - time_taken;
         } else {
-            time_remaining = 0;
+            time_remaining = 0L;
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
         sprintf(timeline_str,
                 "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-                time_taken / 60, time_taken % 60, time_remaining / 60,
+                (long) time_taken / 60, time_taken % 60, time_remaining / 60,
                 time_remaining % 60);
         sprintf(percentline_str, " %3d%% done                 %3d%% to go",
@@ -1204 +1204 @@
                 log_msg(2, "percentage = %d", percentage);
             }
-            mr_strcat(taskprogress, "] %3d%c", percentage, '%');
+            mr_strcat(taskprogress, "] %3d%%", percentage);
             mr_strcat(taskprogress, " done; %2ld:%02ld to go",
-                    time_remaining / 60, time_remaining % 60);
+                    (long) time_remaining / 60, (long) time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
             paranoid_free(taskprogress);