diff options
| author | Elliott Hughes <enh@google.com> | 2017-11-02 16:58:44 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-11-02 16:58:44 -0700 |
| commit | 618303ca4ad2754071ba6955da690fec2b27a76d (patch) | |
| tree | 97f8db830c0241850a8bdb3008127b9a92afecfc /libc/stdio/vfprintf.cpp | |
| parent | 46621f43b083d9743545b31e97011a1c44e784b2 (diff) | |
More printf de-duplication.
Fix the 'j' (intmax_t/uintmax_t) length qualifier in the wide
variant. (With new tests that fail without this fix.)
Fix a typo in the wide support for intmax_t*, which isn't testable because
%n is disabled on Android (and will be removed in a later cleanup pass).
Also move the public vfprintf/vfwprint functions into stdio.cpp.
Bug: http://b/67371539
Test: ran tests
Change-Id: Ib003599b1e9cb789044a068940b59e447f2cb7cb
Diffstat (limited to 'libc/stdio/vfprintf.cpp')
| -rw-r--r-- | libc/stdio/vfprintf.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libc/stdio/vfprintf.cpp b/libc/stdio/vfprintf.cpp index 6d1682894..10303d9a2 100644 --- a/libc/stdio/vfprintf.cpp +++ b/libc/stdio/vfprintf.cpp @@ -83,7 +83,7 @@ union arg { wchar_t* pwchararg; }; -static int __find_arguments(const char* fmt0, va_list ap, union arg** argtable, size_t* argtablesiz); +static int __find_arguments(const CHAR_TYPE* fmt0, va_list ap, union arg** argtable, size_t* argtablesiz); static int __grow_type_table(unsigned char** typetable, int* tablesize); /* @@ -250,16 +250,6 @@ static int exponent(CharT* p0, int exp, int fmtch) { #define CHARINT 0x0800 /* 8 bit integer */ #define MAXINT 0x1000 /* largest integer size (intmax_t) */ -int vfprintf(FILE* fp, const char* fmt0, __va_list ap) { - int ret; - - FLOCKFILE(fp); - ret = __vfprintf(fp, fmt0, ap); - FUNLOCKFILE(fp); - return (ret); -} -DEF_STRONG(vfprintf); - int __vfprintf(FILE* fp, const char* fmt0, __va_list ap) { char* fmt; /* format string */ int ch; /* character from fmt */ |