Changeset 3871 in MondoRescue for branches/3.3/mondo/src/common/newt-specific.c

Timestamp:

Mar 7, 2024, 6:06:33 PM (4 months ago)

Author:

Bruno Cornec

Message:

Fix syntax issues

File:

• branches/3.3/mondo/src/common/newt-specific.c (modified) (3 diffs)

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

@@ -28 +28 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-gui-EXT.h"
-#include "lib-common-externs.h"
+
 
 extern char *MONDO_LOGFILE;
 
 extern struct s_bkpinfo *bkpinfo;
-
-extern char *mr_center_string(char *in, int width);
 
 /*@unused@*/
@@ -639 +637 @@
 
 /**
+ * Update the progress form's complete blurb and show @p g_current_progress.
+ * @param blurb1 The first line of the blurb. Use @p g_blurb_str_1 to keep it unchanged.
+ * @param blurb2 The second line of the blurb. Use @p g_blurb_str_3 (no, that's not a typo) to keep it the same.
+ * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
+ */
+void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
+
+        /*@ long ***************************************************** */
+        long current_time = 0L;
+        long time_taken = 0L;
+        long time_remaining = 0L;
+        long time_total_est = 0L;
+
+        char *blurb1_str = NULL;
+        char *blurb2_str = NULL;
+        char *blurb3_str = NULL;
+
+        /*@ int ******************************************************* */
+        int percentage = 0;
+        int i = 0;
+
+        /*@ buffers *************************************************** */
+        char *percentline_str = NULL;
+        char *timeline_str = NULL;
+        char *taskprogress = NULL;
+
+        if (!g_text_mode) {
+            assert(blurb1 != NULL);
+            assert(blurb2 != NULL);
+            assert(blurb3 != NULL);
+            assert(g_timeline != NULL);
+        }
+
+        current_time = get_time();
+        time_taken = current_time - g_start_time;
+        if (g_maximum_progress == 0) {
+            percentage = 0;
+        } else {
+            if (g_current_progress > g_maximum_progress) {
+                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
+                g_current_progress = g_maximum_progress;
+            }
+            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
+        }
+        if (percentage < 1) {
+            percentage = 1;
+        }
+        if (percentage > 100) {
+            percentage = 100;
+        }
+        if (g_current_progress) {
+            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
+            time_remaining = time_total_est - time_taken;
+        } else {
+            time_remaining = 0L;
+        }
+        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        if (g_text_mode) {
+            printf("---progress-form---1--- %s\n", blurb1);
+            printf("---progress-form---2--- %s\n", blurb2);
+            printf("---progress-form---3--- %s\n", blurb3);
+            printf("---progress-form---E---\n");
+            mr_asprintf(taskprogress, "TASK:  [");
+            for (i = 0; i < percentage; i += 5) {
+                mr_strcat(taskprogress, "*");
+            }
+            for (; i < 100; i += 5) {
+                mr_strcat(taskprogress, ".");
+            }
+            if (percentage > 100) {
+                log_msg(2, "percentage = %d", percentage);
+            }
+            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
+            printf("---progress-form---4--- %s\n", taskprogress);
+            paranoid_free(taskprogress);
+        } else {
+            mr_asprintf(timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
+
+            blurb1_str = mr_center_string(blurb1, 54);
+            blurb2_str = mr_center_string(blurb2, 54);
+            blurb3_str = mr_center_string(blurb3, 54);
+            if (g_blurb1) {
+                newtLabelSetText(g_blurb1, blurb1_str);
+            }
+            if (g_blurb2) {
+                // Not a typo but ridiculous !
+                newtLabelSetText(g_blurb2, blurb3_str);
+            }
+            if (g_blurb3) {
+                // Not a typo but ridiculous !
+                newtLabelSetText(g_blurb3, blurb2_str);
+            }
+            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
+            if ((percentage >= 2) && (g_timeline)) {
+                newtLabelSetText(g_timeline, timeline_str);
+            }
+            mr_free(timeline_str);
+
+            if (g_percentline) {
+                newtLabelSetText(g_percentline, percentline_str);
+            }
+            mr_free(percentline_str);
+            mr_free(blurb1_str);
+            mr_free(blurb2_str);
+            mr_free(blurb3_str);
+
+            newtDrawForm(g_progressForm);
+            newtRefresh();
+        }
+    }
+
+
+/**
  * Open a progress form with title @p title.
  * @param title The title to use for the progress form (will be put in the title bar on Newt).
@@ -1109 +1221 @@
         update_progress_form_full(g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
 }
-
-
-/**
- * Update the progress form's complete blurb and show @p g_current_progress.
- * @param blurb1 The first line of the blurb. Use @p g_blurb_str_1 to keep it unchanged.
- * @param blurb2 The second line of the blurb. Use @p g_blurb_str_3 (no, that's not a typo) to keep it the same.
- * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
- */
-void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
-
-        /*@ long ***************************************************** */
-        long current_time = 0L;
-        long time_taken = 0L;
-        long time_remaining = 0L;
-        long time_total_est = 0L;
-
-        char *blurb1_str = NULL;
-        char *blurb2_str = NULL;
-        char *blurb3_str = NULL;
-
-        /*@ int ******************************************************* */
-        int percentage = 0;
-        int i = 0;
-
-        /*@ buffers *************************************************** */
-        char *percentline_str = NULL;
-        char *timeline_str = NULL;
-        char *taskprogress = NULL;
-
-        if (!g_text_mode) {
-            assert(blurb1 != NULL);
-            assert(blurb2 != NULL);
-            assert(blurb3 != NULL);
-            assert(g_timeline != NULL);
-        }
-
-        current_time = get_time();
-        time_taken = current_time - g_start_time;
-        if (g_maximum_progress == 0) {
-            percentage = 0;
-        } else {
-            if (g_current_progress > g_maximum_progress) {
-                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
-                g_current_progress = g_maximum_progress;
-            }
-            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
-        }
-        if (percentage < 1) {
-            percentage = 1;
-        }
-        if (percentage > 100) {
-            percentage = 100;
-        }
-        if (g_current_progress) {
-            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
-            time_remaining = time_total_est - time_taken;
-        } else {
-            time_remaining = 0L;
-        }
-        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        if (g_text_mode) {
-            printf("---progress-form---1--- %s\n", blurb1);
-            printf("---progress-form---2--- %s\n", blurb2);
-            printf("---progress-form---3--- %s\n", blurb3);
-            printf("---progress-form---E---\n");
-            mr_asprintf(taskprogress, "TASK:  [");
-            for (i = 0; i < percentage; i += 5) {
-                mr_strcat(taskprogress, "*");
-            }
-            for (; i < 100; i += 5) {
-                mr_strcat(taskprogress, ".");
-            }
-            if (percentage > 100) {
-                log_msg(2, "percentage = %d", percentage);
-            }
-            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
-            printf("---progress-form---4--- %s\n", taskprogress);
-            paranoid_free(taskprogress);
-        } else {
-            mr_asprintf(timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
-
-            blurb1_str = mr_center_string(blurb1, 54);
-            blurb2_str = mr_center_string(blurb2, 54);
-            blurb3_str = mr_center_string(blurb3, 54);
-            if (g_blurb1) {
-                newtLabelSetText(g_blurb1, blurb1_str);
-            }
-            if (g_blurb2) {
-                // Not a typo but ridiculous !
-                newtLabelSetText(g_blurb2, blurb3_str);
-            }
-            if (g_blurb3) {
-                // Not a typo but ridiculous !
-                newtLabelSetText(g_blurb3, blurb2_str);
-            }
-            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
-            if ((percentage >= 2) && (g_timeline)) {
-                newtLabelSetText(g_timeline, timeline_str);
-            }
-            mr_free(timeline_str);
-
-            if (g_percentline) {
-                newtLabelSetText(g_percentline, percentline_str);
-            }
-            mr_free(percentline_str);
-            mr_free(blurb1_str);
-            mr_free(blurb2_str);
-            mr_free(blurb3_str);
-
-            newtDrawForm(g_progressForm);
-            newtRefresh();
-        }
-    }