Changeset 2377 in MondoRescue

Timestamp:

Sep 9, 2009, 1:03:53 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove some fixed strings again

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-string.c (modified) (1 diff)
• newt-specific.c (modified) (39 diffs)

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -868 +868 @@
  * @return The severity (1-3).
  */
-int severity_of_difference(char *fn, char *out_reason)
-{
+int severity_of_difference(char *fn, char *out_reason) {
+
     int sev;
     char *reason = NULL;

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

@@ -230 +230 @@
         }
         if (g_current_progress == -999) {
-            log_msg(2,
-                    "Trying to close the progress form when it ain't open!");
+            log_msg(2, "Trying to close the progress form when it ain't open!");
             return;
         }
@@ -278 +277 @@
  * @note This function never returns.
  */
-    void
-     fatal_error(char *error_string) {
+void fatal_error(char *error_string) {
+
         /*@ buffers ***************************************************** */
         char *command = NULL;
@@ -364 +363 @@
  * @note This function never returns.
  */
-    void finish(int signal) {
+void finish(int signal) {
 
         char *command = NULL;
@@ -473 +472 @@
  * @note The message is also written to the logfile.
  */
-    void
-     log_to_screen(const char *fmt, ...) {
+void log_to_screen(const char *fmt, ...) {
 
         /*@ int ************************************************************** */
@@ -530 +528 @@
  * @param output The string to write.
  */
-    void
-     mvaddstr_and_log_it(int y, int x, char *output) {
+void mvaddstr_and_log_it(int y, int x, char *output) {
+
         assert_string_is_neither_NULL_nor_zerolength(output);
         log_msg(0, output);
@@ -549 +547 @@
  * @param ttl The title to use for the evalcall form.
  */
-    void
-     open_evalcall_form(char *ttl) {
+void open_evalcall_form(char *ttl) {
 
         /*@ buffers ********************************************************* */
@@ -603 +600 @@
  * @param max_val The maximum amount of progress (number of filesets, etc.)
  */
-    void
-     open_progress_form(char *title, char *b1, char *b2, char *b3,
-                        long max_val) {
+void open_progress_form(char *title, char *b1, char *b2, char *b3, long max_val) {
 
         /*@ buffers ********************************************************* */
@@ -616 +611 @@
         g_mysterious_dot_counter = 0;
 
-        malloc_string(blurb1);
-        malloc_string(blurb2);
-        malloc_string(blurb3);
         malloc_string(b1c);
 
@@ -626 +618 @@
         assert(b3 != NULL);
 
-        strcpy(blurb1,  b1);
-        strcpy(blurb2,  b2);
-        strcpy(blurb3,  b3);
+        mr_asprintf(blurb1,  "%s", b1);
+        mr_asprintf(blurb2,  "%s", b2);
+        mr_asprintf(blurb3,  "%s", b3);
+
         strcpy(b1c, b1);
         center_string(b1c, 80);
@@ -649 +642 @@
             g_blurb2 = newtLabel(2, 2, blurb3);
             g_blurb3 = newtLabel(2, 4, blurb2);
-            //      newtOpenWindow (10, 4, 60, 11, title);
             newtCenteredWindow(60, 11, title);
             g_scale = newtScale(3, 6, 54, g_maximum_progress);
@@ -655 +647 @@
             g_percentline = newtLabel(10, 9, "This is the percentline");
             g_timeline = newtLabel(10, 8, "This is the timeline");
-            newtFormAddComponents(g_progressForm, g_percentline,
-                                  g_timeline, g_scale, g_blurb1, g_blurb3,
-                                  g_blurb2, NULL);
+            newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
             newtPushHelpLine(b1c);
             newtRefresh();
@@ -672 +662 @@
  * @param prompt The message.
  */
-    void
-     popup_and_OK(char *prompt) {
+void popup_and_OK(char *prompt) {
+
         char ch;
 
@@ -680 +670 @@
         log_msg(0, prompt);
         if (g_text_mode) {
-            printf
-                ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
-                 prompt);
+            printf("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ", prompt);
             while (((ch = getchar()) != '\n') && (ch != EOF));
         } else {
@@ -696 +684 @@
  * @return output string if the user pressed OK, NULL if they pressed Cancel.
  */
-    char *popup_and_get_string(char *title, char *b, char *input) {
+char *popup_and_get_string(char *title, char *b, char *input) {
 
         /*@ newt ************************************************************ */
@@ -731 +719 @@
         mr_asprintf(blurb, "%s", b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        type_here =
-            newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                      input, 50,
+        type_here = newtEntry(2, newtTextboxGetNumLines(text) + 2, input, 50,
 #ifdef __cplusplus
                       0, NEWT_FLAG_RETURNEXIT
@@ -768 +754 @@
  * @return TRUE if @p button1 was pushed, FALSE otherwise.
  */
-    bool popup_with_buttons(char *p, char *button1, char *button2) {
+bool popup_with_buttons(char *p, char *button1, char *button2) {
 
         /*@ buffers *********************************************************** */
@@ -808 +794 @@
         prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
-        b_1 =
-            newtButton(20 -
-                       ((button2[0] !=
-                         '\0') ? strlen(button1) +
-                        2 : strlen(button1) / 2),
-                       newtTextboxGetNumLines(text) + 3, button1);
+        b_1 = newtButton(20 - ((button2[0] != '\0') ? strlen(button1) + 2 : strlen(button1) / 2), newtTextboxGetNumLines(text) + 3, button1);
         if (button2[0] != '\0') {
-            b_2 =
-                newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
+            b_2 = newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
         } else {
             b_2 = NULL;
         }
-        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
         myForm = newtForm(NULL, NULL, 0);
@@ -846 +825 @@
  * on the screen.
  */
-    void
-     refresh_log_screen() {
+void refresh_log_screen() {
 
         /*@ int *********************************************************** */
@@ -874 +852 @@
  * only allocate some memory.
  */
-    void
-     setup_newt_stuff() {
+void setup_newt_stuff() {
 
         /*@ int *********************************************************** */
@@ -908 +885 @@
  * @param denom The denomenator of the ratio.
  */
-    void
-     update_evalcall_form_ratio(int num, int denom) {
+void update_evalcall_form_ratio(int num, int denom) {
 
         /*@ long ************************************************************ */
@@ -1001 +977 @@
  * @param curr The current amount of progress (percentage) in the evalcall form.
  */
-    void
-     update_evalcall_form(int curr) {
+void update_evalcall_form(int curr) {
+
         update_evalcall_form_ratio(curr, 100);
-    }
+}
 
 
@@ -1013 +989 @@
  * @param blurb3 The new third line of the blurb; use @p g_blurb_str_2 (no, that's not a typo) to keep it the same.
  */
-    void
-     update_progress_form(char *blurb3) {
+void update_progress_form(char *blurb3) {
+
         if (g_current_progress == -999) {
             return;
         }
         strcpy(g_blurb_str_2, blurb3);
-        update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
-                                  g_blurb_str_3);
-    }
+        update_progress_form_full(g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
+}
 
 
@@ -1030 +1005 @@
  * @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) {
+void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
+
         /*@ long ***************************************************** */
         long current_time = 0L;
@@ -1136 +1111 @@
  * @return The backup type chosen, or @c none if the user chose "Exit to shell".
  */
-    t_bkptype which_backup_media_type(bool restoring) {
+t_bkptype which_backup_media_type(bool restoring) {
 
         /*@ char ************************************************************ */
@@ -1145 +1120 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] =
-            { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
-        static char *possible_responses[] =
-            { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
-"nfs", "iso", NULL };
+        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
+        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "nfs", "iso", NULL };
         char *outstr = NULL;
         t_bkptype backup_type;
@@ -1240 +1212 @@
  * @return The compression level (0-9) chosen, or -1 for "Exit".
  */
-    int
-     which_compression_level() {
+int which_compression_level() {
 
         /*@ char ************************************************************ */
@@ -1258 +1229 @@
 
         newtDrawRootText(18, 0, WELCOME_STRING);
-        newtPushHelpLine
-            ("   Please specify the level of compression that you want.");
-        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
+        newtPushHelpLine("   Please specify the level of compression that you want.");
         newtCenteredWindow(34, 13, "How much compression?");
         b1 = newtButton(4, 1, "Maximum");
@@ -1297 +1266 @@
  * @param source_file The file containing a list of filenames to load into @p filelist.
  */
-    int load_filelist_into_array(struct s_filelist *filelist,
-                                 char *source_file) {
+int load_filelist_into_array(struct s_filelist *filelist, char *source_file) {
+
         int i;
         int j = 0;
@@ -1326 +1295 @@
 
         log_msg(2, "Loading %s", source_file);
-        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; filelist->entries++) {
-          god_i_hate_gotos:
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; ) {
             if (tmp != NULL) {
                 mr_free(tmp);
@@ -1337 +1305 @@
             i = (int) strlen(tmp);
             if (i < 2) {
-                goto god_i_hate_gotos;
+                continue;
             }
             if (tmp[i - 1] < 32) {
@@ -1343 +1311 @@
             }
             if (i < 2) {
-                goto god_i_hate_gotos;
+                continue;
             }
             if (!does_file_exist(tmp) && !feof(fin)) {
                 j++;
                 fprintf(fout, "%s\n", tmp);
-
-                goto god_i_hate_gotos;
+                continue;
             }
             filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
@@ -1356 +1323 @@
                 break;
             }
+            filelist->entries++;
         }
         mr_free(tmp);
@@ -1398 +1366 @@
 
 
-
 /**
  * Generate a pretty string based on @p flentry.
@@ -1405 +1372 @@
  * @note The returned value points to static storage that will be overwritten with each call.
  */
-    char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
-        static char comment[100];
+char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
         char *tmp = NULL;
 
-        log_it("entering");
+        log_msg(8, "entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
@@ -1420 +1386 @@
             mr_asprintf(tmp, "high");
         }
-        mr_strcat(tmp, "  ");
-        mr_strcat(tmp, flentry->filename);
-        strncpy(comment, tmp, 99);
-        paranoid_free(tmp);
-
-        log_it("leaving");
-        return (comment);
-    }
-
-
-
+        mr_strcat(tmp, "  %s", flentry->filename);
+
+        log_msg(8, "leaving");
+        return (tmp);
+    }
 
 
@@ -1438 +1398 @@
  * @param source_file The file containing a list of changed files.
  */
-    void popup_changelist_from_file(char *source_file) {
+void popup_changelist_from_file(char *source_file) {
+
         char *reason;
         newtComponent myForm;
@@ -1489 +1450 @@
             return;
         }
-        log_msg(2, "%d files loaded into filelist array",
-                filelist->entries);
+        log_msg(2, "%d files loaded into filelist array", filelist->entries);
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
-            newtListboxAppendEntry(fileListbox,
-                                   filelist_entry_to_string(&
-                                                            (filelist->
-                                                             el[i])),
-                                   keylist[i]);
+            tmp = filelist_entry_to_string(&(filelist->el[i])), keylist[i];
+            newtListboxAppendEntry(fileListbox, tmp);
+            mr_free(tmp);
         }
         mr_asprintf(differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
@@ -1511 +1469 @@
         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
-                              bSelect, NULL);
+        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose, bSelect, NULL);
 
         malloc_string(reason);
@@ -1554 +1511 @@
 
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage);
+void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage);