Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-string.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-string.c (modified) (2 diffs)

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

@@ -665 +665 @@
  */
 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 ***************************************************** */
@@ -752 +780 @@
  * @return @p partition.
  */
-char *truncate_to_drive_name(char *partition)
+char *truncate_to_drive_name(const char *partition)
 {
     int i = strlen(partition) - 1;