perf events: Remove CONFIG_EVENT_PROFILE

[safe/jmp/linux-2.6] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index 3a912a4..afce96a 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -352,20 +352,20 @@ char *skip_spaces(const char *str)
 EXPORT_SYMBOL(skip_spaces);
 
 /**
- * strstrip - Removes leading and trailing whitespace from @s.
+ * strim - Removes leading and trailing whitespace from @s.
  * @s: The string to be stripped.
  *
  * Note that the first trailing whitespace is replaced with a %NUL-terminator
  * in the given string @s. Returns a pointer to the first non-whitespace
  * character in @s.
  */
-char *strstrip(char *s)
+char *strim(char *s)
 {
        size_t size;
        char *end;
 
+       s = skip_spaces(s);
        size = strlen(s);
-
        if (!size)
                return s;
 
@@ -374,9 +374,9 @@ char *strstrip(char *s)
                end--;
        *(end + 1) = '\0';
 
-       return skip_spaces(s);
+       return s;
 }
-EXPORT_SYMBOL(strstrip);
+EXPORT_SYMBOL(strim);
 
 #ifndef __HAVE_ARCH_STRLEN
 /**