diff options
| author | David Schultz <das@FreeBSD.org> | 2009-02-28 06:06:57 +0000 |
|---|---|---|
| committer | David Schultz <das@FreeBSD.org> | 2009-02-28 06:06:57 +0000 |
| commit | 353ce11c8bf3f695cfa2d412565e03b64afdb26a (patch) | |
| tree | 7523c9dd08e5896a325226e1c1c23b88ff90a00d /lib/libc/stdio/vfwprintf.c | |
| parent | 9c5cb6d8ae38a9fd39e344721a729d05cf121ce3 (diff) | |
Notes
Diffstat (limited to 'lib/libc/stdio/vfwprintf.c')
| -rw-r--r-- | lib/libc/stdio/vfwprintf.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 2aa49724f79b..f3768de8d193 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -890,23 +890,7 @@ fp_common: cp = convbuf; } } - - if (prec >= 0) { - /* - * can't use wcslen; can only look for the - * NUL in the first `prec' characters, and - * wcslen() will go further. - */ - wchar_t *p = wmemchr(cp, 0, (size_t)prec); - - if (p != NULL) { - size = p - cp; - if (size > prec) - size = prec; - } else - size = prec; - } else - size = wcslen(cp); + size = (prec >= 0) ? wcsnlen(cp, prec) : wcslen(cp); sign = '\0'; break; case 'U': |