lib/vsprintf.c: move string() below widen_string()

[cascardo/linux.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 3f37b47..854d597 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -510,37 +510,6 @@ char *number(char *buf, char *end, unsigned long long num,
        return buf;
 }
 
-static noinline_for_stack
-char *string(char *buf, char *end, const char *s, struct printf_spec spec)
-{
-       int len, i;
-
-       if ((unsigned long)s < PAGE_SIZE)
-               s = "(null)";
-
-       len = strnlen(s, spec.precision);
-
-       if (!(spec.flags & LEFT)) {
-               while (len < spec.field_width--) {
-                       if (buf < end)
-                               *buf = ' ';
-                       ++buf;
-               }
-       }
-       for (i = 0; i < len; ++i) {
-               if (buf < end)
-                       *buf = *s;
-               ++buf; ++s;
-       }
-       while (len < spec.field_width--) {
-               if (buf < end)
-                       *buf = ' ';
-               ++buf;
-       }
-
-       return buf;
-}
-
 static void move_right(char *buf, char *end, unsigned len, unsigned spaces)
 {
        size_t size;
@@ -588,6 +557,37 @@ char *widen_string(char *buf, int n, char *end, struct printf_spec spec)
        return buf;
 }
 
+static noinline_for_stack
+char *string(char *buf, char *end, const char *s, struct printf_spec spec)
+{
+       int len, i;
+
+       if ((unsigned long)s < PAGE_SIZE)
+               s = "(null)";
+
+       len = strnlen(s, spec.precision);
+
+       if (!(spec.flags & LEFT)) {
+               while (len < spec.field_width--) {
+                       if (buf < end)
+                               *buf = ' ';
+                       ++buf;
+               }
+       }
+       for (i = 0; i < len; ++i) {
+               if (buf < end)
+                       *buf = *s;
+               ++buf; ++s;
+       }
+       while (len < spec.field_width--) {
+               if (buf < end)
+                       *buf = ' ';
+               ++buf;
+       }
+
+       return buf;
+}
+
 static noinline_for_stack
 char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_spec spec,
                  const char *fmt)