Changeset 1168 in MondoRescue for branches/stable/mondo/src/common/libmondo-string.c

Timestamp:

Feb 15, 2007, 12:27:39 AM (17 years ago)

Author:

Bruno Cornec

Message:

strip_spaces => mr_strip_spaces in mr_str.c and corrected at the same time :-)

File:

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

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

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -98 +100 @@
     for (p = in_out; *p == ' '; p++);
     strcpy(scratch, p);
-    strip_spaces (scratch);
+    mr_strip_spaces (scratch);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -737 +739 @@
 
 
-
-/**
- * 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_spaces(char *in_out)
-{
-    /*@ buffers ***************************************************** */
-    char *tmp = NULL;
-
-    /*@ pointers **************************************************** */
-    char *p;
-
-    /*@ int ******************************************************** */
-    int i;
-    int j;
-    int original_incoming_length;
-
-    /*@ end vars *************************************************** */
-
-    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);
-    strcpy(tmp, in_out + i);
-    for (i = (int) strlen(tmp); i > 0 && tmp[i - 1] <= 32; i--);
-    tmp[i] = '\0';
-    for (i = 0; i < original_incoming_length && MAX_STR_LEN; i++) {
-        in_out[i] = ' ';
-    }
-    in_out[i] = '\0';
-    i = 0;
-    p = tmp;
-    while (*p != '\0') {
-        in_out[i] = *p;
-        p++;
-        in_out[i + 1] = '\0';
-        if (in_out[i] < 32 && i > 0) {
-            if (in_out[i] == 8) {
-                i--;
-            } else if (in_out[i] == 9) {
-                in_out[i++] = ' ';
-            } else if (in_out[i] == '\r')   // added 1st October 2003 -- FIXME
-            {
-                strcpy(tmp, in_out + i);
-                strcpy(in_out, tmp);
-                i = -1;
-                continue;
-            } else if (in_out[i] == '\t') {
-                for (i++; i % 5; i++);
-            } else if (in_out[i] >= 10 && in_out[i] <= 13) {
-                break;
-            } else {
-                i--;
-            }
-        } else {
-            i++;
-        }
-    }
-    in_out[i] = '\0';
-    mr_free(tmp);
-    */
-}
-
-
 /**
  * If there are double quotes "" around @p incoming then remove them.