Changeset 1178 in MondoRescue for branches/stable/mondo/src/lib

Timestamp:

Feb 17, 2007, 2:27:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

Continue to merge trunk memory management enhancements for libmondo-tools.c & libmondo-string.c
Introduction + test of a new function mr_strcat

Location:

branches/stable/mondo/src/lib

Files:

• mr_mem.c (modified) (1 diff)
• mr_str.c (modified) (1 diff)

branches/stable/mondo/src/lib/mr_mem.c

@@ -110 +110 @@
     }
 }
+
+/*
+ * Equivalent function of strcat but safe 
+ * from memory allocation point of view
+ */
+void mr_strcat_int(char **in, const char *add, int line, char *file) {
+    char *p =NULL;
+    
+    if (add == NULL) {
+        return;
+    }
+    if (in == NULL) {
+        mr_msg_int(1,line,file,"Unable to add %s to NULL pointer\nExiting...", add);
+        mr_exit(-1, "Unable to add to a NULL pointer");
+    }
+    if (*in == NULL) {
+        mr_asprintf_int(&p,line,file,add);
+    } else {
+        mr_asprintf_int(&p,line,file,"%s%s",*in,add);
+        mr_free_int((void **)in,line,file);
+    }
+    *in = p;
+}

branches/stable/mondo/src/lib/mr_str.c

@@ -122 +122 @@
  * @param in_out The string to strip spaces/control characters from (modified).
  */
-void mr_strip_spaces(char *in_out)
-{
-    /*@ int ******************************************************** */
+void mr_strip_spaces(char *in_out) {
     int i;
     int j;
     size_t length;
-
-    /*@ end vars *************************************************** */
 
     if (in_out == NULL) {