Changeset 1148 in MondoRescue

Timestamp:

Feb 12, 2007, 11:41:51 AM (18 years ago)

Author:

Bruno Cornec

Message:

rewrite of strip_spaces (way shorter, maybe less complete, but valgrind clean)

File:

• branches/stable/mondo/src/common/libmondo-string.c (modified) (4 diffs)

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

@@ -746 +746 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -753 +753 @@
     /*@ int ******************************************************** */
     int i;
+    int j;
     int original_incoming_length;
 
@@ -758 +759 @@
 
     assert(in_out != NULL);
+    original_incoming_length = (int)strlen(in_out);
+
+    for (i = 0; (in_out[i] <= ' ' || in_out[i] == '\t' || in_out[i] == '\r') 
+                    && i < original_incoming_length ; i++);
+    for (j = 0; in_out[i] > ' ' && in_out[i] != '\t' && in_out[i] != '\r' 
+                    && i < original_incoming_length ; i++, j++) {
+        in_out[j] = in_out[i];
+    }
+    in_out[j] = '\0';
+
+    /* BERLIOS: Old code 
     malloc_string(tmp);
-    original_incoming_length = (int) strlen(in_out);
-    for (i = 0; in_out[i] <= ' ' && i < (int) strlen(in_out); i++);
     strcpy(tmp, in_out + i);
     for (i = (int) strlen(tmp); i > 0 && tmp[i - 1] <= 32; i--);
@@ -798 +808 @@
     in_out[i] = '\0';
     mr_free(tmp);
+    */
 }