Index: fusl/src/stdio/vswprintf.c |
diff --git a/fusl/src/stdio/vswprintf.c b/fusl/src/stdio/vswprintf.c |
index 7d237bae72e945e5e4fdc459090e6ab75333636a..580845a40bb8e5a5a11b0e1e9f5258cf75918b4b 100644 |
--- a/fusl/src/stdio/vswprintf.c |
+++ b/fusl/src/stdio/vswprintf.c |
@@ -6,48 +6,49 @@ |
#include <wchar.h> |
struct cookie { |
- wchar_t *ws; |
- size_t l; |
+ wchar_t* ws; |
+ size_t l; |
}; |
-static size_t sw_write(FILE *f, const unsigned char *s, size_t l) |
-{ |
- size_t l0 = l; |
- int i = 0; |
- struct cookie *c = f->cookie; |
- if (s!=f->wbase && sw_write(f, f->wbase, f->wpos-f->wbase)==-1) |
- return -1; |
- while (c->l && l && (i=mbtowc(c->ws, (void *)s, l))>=0) { |
- s+=i; |
- l-=i; |
- c->l--; |
- c->ws++; |
- } |
- *c->ws = 0; |
- return i<0 ? i : l0; |
+static size_t sw_write(FILE* f, const unsigned char* s, size_t l) { |
+ size_t l0 = l; |
+ int i = 0; |
+ struct cookie* c = f->cookie; |
+ if (s != f->wbase && sw_write(f, f->wbase, f->wpos - f->wbase) == -1) |
+ return -1; |
+ while (c->l && l && (i = mbtowc(c->ws, (void*)s, l)) >= 0) { |
+ s += i; |
+ l -= i; |
+ c->l--; |
+ c->ws++; |
+ } |
+ *c->ws = 0; |
+ return i < 0 ? i : l0; |
} |
-int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap) |
-{ |
- int r; |
- FILE f; |
- unsigned char buf[256]; |
- struct cookie c = { s, n-1 }; |
+int vswprintf(wchar_t* restrict s, |
+ size_t n, |
+ const wchar_t* restrict fmt, |
+ va_list ap) { |
+ int r; |
+ FILE f; |
+ unsigned char buf[256]; |
+ struct cookie c = {s, n - 1}; |
- memset(&f, 0, sizeof(FILE)); |
- f.lbf = EOF; |
- f.write = sw_write; |
- f.buf_size = sizeof buf; |
- f.buf = buf; |
- f.lock = -1; |
- f.cookie = &c; |
- if (!n) { |
- return -1; |
- } else if (n > INT_MAX) { |
- errno = EOVERFLOW; |
- return -1; |
- } |
- r = vfwprintf(&f, fmt, ap); |
- sw_write(&f, 0, 0); |
- return r>=n ? -1 : r; |
+ memset(&f, 0, sizeof(FILE)); |
+ f.lbf = EOF; |
+ f.write = sw_write; |
+ f.buf_size = sizeof buf; |
+ f.buf = buf; |
+ f.lock = -1; |
+ f.cookie = &c; |
+ if (!n) { |
+ return -1; |
+ } else if (n > INT_MAX) { |
+ errno = EOVERFLOW; |
+ return -1; |
+ } |
+ r = vfwprintf(&f, fmt, ap); |
+ sw_write(&f, 0, 0); |
+ return r >= n ? -1 : r; |
} |