tree-wide: convert open calls to remove spaces to skip_spaces() lib function

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

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c50733a..7857d4d 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1766,13 +1766,6 @@ EXPORT_SYMBOL_GPL(bprintf);
 
 #endif /* CONFIG_BINARY_PRINTF */
 
 
 #endif /* CONFIG_BINARY_PRINTF */
 

-static noinline char *skip_space(const char *str)
-{
-       while (isspace(*str))
-               ++str;
-       return (char *)str;
-}
-

 /**
  * vsscanf - Unformat a buffer into a list of arguments
  * @buf:       input buffer
 /**
  * vsscanf - Unformat a buffer into a list of arguments
  * @buf:       input buffer


@@ -1794,8 +1787,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 * white space, including none, in the input.
                 */
                if (isspace(*fmt)) {
                 * white space, including none, in the input.
                 */
                if (isspace(*fmt)) {

-                       fmt = skip_space(fmt);
-                       str = skip_space(str);
+                       fmt = skip_spaces(++fmt);
+                       str = skip_spaces(str);

                }
 
                /* anything that is not a conversion must match exactly */
                }
 
                /* anything that is not a conversion must match exactly */


@@ -1865,7 +1858,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                        if (field_width == -1)
                                field_width = INT_MAX;
                        /* first, skip leading white space in buffer */
                        if (field_width == -1)
                                field_width = INT_MAX;
                        /* first, skip leading white space in buffer */

-                       str = skip_space(str);
+                       str = skip_spaces(str);

 
                        /* now copy until next white space */
                        while (*str && !isspace(*str) && field_width--)
 
                        /* now copy until next white space */
                        while (*str && !isspace(*str) && field_width--)


@@ -1907,7 +1900,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                /* have some sort of integer conversion.
                 * first, skip white space in buffer.
                 */
                /* have some sort of integer conversion.
                 * first, skip white space in buffer.
                 */

-               str = skip_space(str);
+               str = skip_spaces(str);

 
                digit = *str;
                if (is_sign && digit == '-')
 
                digit = *str;
                if (is_sign && digit == '-')