Changeset 2414 in MondoRescue

Timestamp:

Sep 20, 2009, 2:53:32 AM (15 years ago)

Author:

Bruno Cornec

Message:

severity_of_difference is now allocating memory freed by the caller

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (3 diffs)
• libmondo-string.h (modified) (1 diff)
• newt-specific.c (modified) (3 diffs)

branches/2.2.10/mondo/src/common/libmondo-string-EXT.h

@@ -29 +29 @@
 
 extern int compare_two_filelist_entries(void *va, void *vb);
-extern int severity_of_difference(char *filename, char *out_reason);
+extern int severity_of_difference(char *filename, char **out_reason);
 
 extern char *percent_media_full_comment();

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

@@ -851 +851 @@
  * @return The severity (1-3).
  */
-int severity_of_difference(char *fn, char *out_reason) {
-
-    int sev;
+int severity_of_difference(char *fn, char **out_reason) {
+
+    int sev = 3;
     char *reason = NULL;
     char *filename = NULL;
@@ -867 +867 @@
     }
 
-    sev = 3;
     mr_asprintf(reason, "Changed since backup. Consider running a differential backup in a day or two.");
 
@@ -956 +955 @@
         mr_asprintf(reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
-    if (out_reason) {
-        strcpy(out_reason, reason);
+
+    if (reason != NULL) {
+        *out_reason = reason;
     }
     mr_free(filename);
-    mr_free(reason);
     return (sev);
 }

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

@@ -26 +26 @@
 
 int compare_two_filelist_entries(void *va, void *vb);
-int severity_of_difference(char *filename, char *out_reason);
+int severity_of_difference(char *filename, char **out_reason);
 
 char *percent_media_full_comment();

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

@@ -1401 +1401 @@
 void popup_changelist_from_file(char *source_file) {
 
-        char *reason;
+        char *reason = NULL;
         newtComponent myForm;
         newtComponent bClose;
@@ -1472 +1472 @@
         newtFormAddComponents(myForm, headerMsg, fileListbox, bClose, bSelect, NULL);
 
-        malloc_string(reason);
         while (!finished) {
             b_res = newtRunForm(myForm);
@@ -1487 +1486 @@
                     currline = i;
                     if (filelist->entries > 0) {
-                        severity_of_difference(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);
+                        mr_free(reason);
                     }
                 }
             }
         }
-        paranoid_free(reason);
 
         newtFormDestroy(myForm);