Changeset 688 in MondoRescue for trunk/mondo/mondo/common/libmondo-string.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/common/libmondo-string.c (modified) (2 diffs)

trunk/mondo/mondo/common/libmondo-string.c

@@ -33 +33 @@
  * @note If @p drive ends in a digit, then 'p' (on Linux) or 's' (on *BSD) is added before @p partno.
  */
-char *build_partition_name(char *partition, const char *drive, int partno)
+char *build_partition_name(const char *drive, int partno)
 {
     char *p, *c;
-
-    assert(partition != NULL);
+    char *partition;
+
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0);
@@ -537 +537 @@
 
     /*@ buffers **************************************************** */
-    char *output;
-    char *suffix;
+    char *output = NULL;
+    char *suffix = NULL;
 
     /*@ end vars *************************************************** */
 
     assert_string_is_neither_NULL_nor_zerolength(path);
-    if (s[0] != '\0') {
+
+    if (s != NULL) {
         asprintf(&suffix, ".%s", s);
     } else {
-        asprintf(&suffix, "%s", " ");
+        asprintf(&suffix, "%s", "");
     }
     asprintf(&output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno,