Changeset 2274 in MondoRescue

Timestamp:

Jul 13, 2009, 2:34:28 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3260@localhost: bruno | 2009-07-12 20:27:08 +0200
Replace sprintf by mr_asprintf in newt-specific.c

Location:

branches/2.2.10/mondo/src/common

Files:

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

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

@@ -944 +944 @@
     malloc_string(reason);
     malloc_string(filename);
-// out_reason might be null on purpose, so don't bomb if it is :) OK?
+    
+    // out_reason might be null on purpose, so don't bomb if it is :) OK?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {

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

@@ -985 +985 @@
 
         /*@ buffers ********************************************************** */
-        char *timeline_str;
+        char *timeline_str = NULL;
         char *pcline_str = NULL;
         char *taskprogress = NULL;
@@ -994 +994 @@
         int j = 0;
 
-        malloc_string(timeline_str);
-        timeline_str[0] = '\0';
-//  log_it("update_eval_call_form called");
         if (num * 100 < denom) {
             percentage = 1;
@@ -1020 +1017 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            sprintf(timeline_str,
+            mr_asprintf(&timeline_str,
                     "%2ld:%02ld taken            %2ld:%02ld remaining",
                     time_taken / 60, time_taken % 60, time_remaining / 60,
@@ -1064 +1061 @@
                 }
             }
-            paranoid_free(pcline_str);
+            mr_free(pcline_str);
+            mr_free(timeline_str);
         }
         if (!g_text_mode) {
@@ -1070 +1068 @@
             newtRefresh();
         }
-        paranoid_free(timeline_str);
     }
 
@@ -1123 +1120 @@
 
         /*@ buffers *************************************************** */
-        char *percentline_str;
-        char *timeline_str;
+        char *percentline_str = NULL;
+        char *timeline_str = NULL;
         char *taskprogress = NULL;
-        char *tmp;
-
-//  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
-        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        malloc_string(tmp);
+        char *tmp = NULL;
+
         if (!g_text_mode) {
             assert(blurb1 != NULL);
@@ -1139 +1132 @@
         }
 
-        percentline_str[0] = '\0';
-
         current_time = get_time();
         time_taken = current_time - g_start_time;
@@ -1147 +1138 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                sprintf(tmp,
+                mr_asprintf(&tmp,
                         "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
                         blurb1, blurb2, blurb3, g_current_progress,
                         g_maximum_progress);
                 log_msg(0, tmp);
+                mr_free(tmp);
                 g_current_progress = g_maximum_progress;
             }
@@ -1172 +1164 @@
         }
         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,
-                time_remaining % 60);
-        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
-                percentage, 100 - percentage);
-
         if (g_text_mode) {
             printf("---progress-form---1--- %s\n", blurb1);
@@ -1200 +1185 @@
             paranoid_free(taskprogress);
         } else {
+            mr_asprintf(&timeline_str,
+                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+                time_taken / 60, time_taken % 60, time_remaining / 60,
+                time_remaining % 60);
+            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go",
+                percentage, 100 - percentage);
+
             center_string(blurb1, 54);
             center_string(blurb2, 54);
@@ -1216 +1208 @@
                 newtLabelSetText(g_timeline, timeline_str);
             }
+            mr_free(timeline_str);
+
             if (g_percentline) {
                 newtLabelSetText(g_percentline, percentline_str);
             }
+            mr_free(percentline_str);
+
             newtRefresh();
         }
-        paranoid_free(percentline_str);
-        paranoid_free(timeline_str);
-        paranoid_free(tmp);
     }
 
@@ -1579 +1572 @@
 
         /*@ buffers ********************************************************* */
-        char *tmp;
-        char *differ_sz;
+        char *tmp = NULL;
+        char *differ_sz = NULL;
 
         struct s_filelist *filelist;
-        malloc_string(reason);
-        tmp = malloc(5000);
-        malloc_string(differ_sz);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
             log_msg(2, "Text mode. Therefore, no popup list.");
-            goto free_to_go;
+            return;
         }
         log_msg(2, "Examining file %s", source_file);
@@ -1596 +1586 @@
         if (lng < 1) {
             log_msg(2, "No lines in file. Therefore, no popup list.");
-            paranoid_free(reason);
-            goto free_to_go;
+            return;
         } else if (lng >= ARBITRARY_MAXIMUM) {
             log_msg(2, "Too many files differ for me to list.");
-            goto free_to_go;
+            return;
         }
 
@@ -1609 +1598 @@
 
         if (load_filelist_into_array(filelist, source_file)) {
-            log_msg(2, "Can't open %s; therefore, cannot popup list",
-                    source_file);
-            paranoid_free(reason);
+            log_msg(2, "Can't open %s; therefore, cannot popup list", source_file);
             return;
         }
@@ -1624 +1611 @@
                                    keylist[i]);
         }
-        sprintf(differ_sz,
+        mr_asprintf(&differ_sz,
                 "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
                 i);
         newtPushHelpLine(differ_sz);
+        mr_free(differ_sz);
+
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
+        mr_asprintf(&tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
+        mr_free(tmp);
+
         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
                               bSelect, NULL);
+
+        malloc_string(reason);
         while (!finished) {
             b_res = newtRunForm(myForm);
@@ -1650 +1643 @@
                     currline = i;
                     if (filelist->entries > 0) {
-                        severity_of_difference(filelist->el[currline].
-                                               filename, reason);
-                        sprintf(tmp, "%s --- %s",
-                                filelist->el[currline].filename, reason);
+                        severity_of_difference(filelist->el[currline].  filename, reason);
+                        mr_asprintf(&tmp, "%s --- %s", filelist->el[currline].filename, reason);
+
                         popup_and_OK(tmp);
+                        mr_free(tmp);
                     }
                 }
             }
         }
+        paranoid_free(reason);
+
         newtFormDestroy(myForm);
         newtPopWindow();
         newtPopHelpLine();
-      free_to_go:
-        paranoid_free(reason);
-        paranoid_free(tmp);
-        paranoid_free(differ_sz);
         return;
     }