Changeset 2414 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-string.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-string.c (modified) (3 diffs)

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);
 }