Changeset 2980 in MondoRescue

Timestamp:

Mar 30, 2012, 2:42:07 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4603@localhost: bruno | 2012-03-29 15:40:58 +0200

• Rewrite strip_space in a much simpler version without valgrind warnings

File:

• branches/3.0/mondo/src/common/libmondo-string.c (modified) (1 diff)

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

@@ -695 +695 @@
  */
 void strip_spaces(char *in_out)
+{
+    /*@ buffers ***************************************************** */
+    char *tmp = NULL;
+
+    /*@ int ******************************************************** */
+    int i;
+
+    /*@ end vars *************************************************** */
+
+    assert(in_out != NULL);
+    malloc_string(tmp);
+    for (i = 0; in_out[i] <= ' ' && i < (int) strlen(in_out) -1; i++);
+    strcpy(tmp, in_out + i);
+    for (i = (int) strlen(tmp) -1; i >= 0 && tmp[i] <= ' '; i--);
+    i++;
+    tmp[i] = '\0';
+
+    // Now tmp contains the stripped string
+    strcpy(in_out,tmp);
+    paranoid_free(tmp);
+}
+
+/**
+ * Remove all characters whose ASCII value is less than or equal to 32
+ * (spaces and control characters) from both sides of @p in_out.
+ * @param in_out The string to strip spaces/control characters from (modified).
+ */
+void strip_spaces2(char *in_out)
 {
     /*@ buffers ***************************************************** */