diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 01:50:58 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 01:50:58 +0000 |
| commit | 6fd3ac79613c9e1832513b0f614860be2735993f (patch) | |
| tree | 5f6bfb750aed249d5951d84de663c03f9e4b82dd /libc/stdio/old_vfprintf.c | |
| parent | 9acef89e60381a298801e4b221d66b1538072b28 (diff) | |
| download | uClibc-alpine-6fd3ac79613c9e1832513b0f614860be2735993f.tar.bz2 uClibc-alpine-6fd3ac79613c9e1832513b0f614860be2735993f.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdio/old_vfprintf.c')
| -rw-r--r-- | libc/stdio/old_vfprintf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c index 8caa3d66d..abf535a16 100644 --- a/libc/stdio/old_vfprintf.c +++ b/libc/stdio/old_vfprintf.c @@ -127,6 +127,9 @@ /**************************************************************************/ +#define _uintmaxtostr __libc__uintmaxtostr +#define strnlen __strnlen + #define _ISOC99_SOURCE /* for ULLONG primarily... */ #define _GNU_SOURCE /* for strnlen */ #include "_stdio.h" @@ -188,7 +191,7 @@ static void _outnstr(FILE *stream, const unsigned char *s, size_t n) if (r > n) { r = n; } - memcpy(f->bufpos, s, r); + __memcpy(f->bufpos, s, r); f->bufpos += r; } } @@ -234,7 +237,7 @@ static void _charpad(FILE * __restrict stream, int padchar, size_t numpad) static void _fp_out_narrow(FILE *fp, intptr_t type, intptr_t len, intptr_t buf) { if (type & 0x80) { /* Some type of padding needed. */ - int buflen = strlen((const char *) buf); + int buflen = __strlen((const char *) buf); if ((len -= buflen) > 0) { _charpad(fp, (type & 0x7f), len); } |