diff options
| author | tjr <tjr@FreeBSD.org> | 2003-11-05 08:20:45 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2003-11-05 08:20:45 +0000 |
| commit | 736d21ee30829ad50145dc4f69a99891c824c68f (patch) | |
| tree | c35ab994daf990dee6de564c4d51c99e38cf895a /lib/libc/stdio/vfwprintf.c | |
| parent | 34fe8a239a2d7322d283dd54a19e4319cd74244f (diff) | |
| download | FreeBSD-src-736d21ee30829ad50145dc4f69a99891c824c68f.zip FreeBSD-src-736d21ee30829ad50145dc4f69a99891c824c68f.tar.gz | |
Pass NULL instead of a pointer to a zeroed mbstate_t object.
Diffstat (limited to 'lib/libc/stdio/vfwprintf.c')
| -rw-r--r-- | lib/libc/stdio/vfwprintf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 3c2392b..3be9365 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -328,7 +328,6 @@ __mbsconv(char *mbsarg, int prec) wchar_t *convbuf, *wcp; const char *p; size_t insize, nchars, nconv; - mbstate_t mbs; if (mbsarg == NULL) return (NULL); @@ -342,11 +341,10 @@ __mbsconv(char *mbsarg, int prec) * String is not guaranteed to be NUL-terminated. Find the * number of characters to print. */ - memset(&mbs, 0, sizeof(mbs)); p = mbsarg; insize = nchars = 0; while (nchars != (size_t)prec) { - nconv = mbrlen(p, MB_CUR_MAX, &mbs); + nconv = mbrlen(p, MB_CUR_MAX, NULL); if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2) break; @@ -369,9 +367,8 @@ __mbsconv(char *mbsarg, int prec) return (NULL); wcp = convbuf; p = mbsarg; - memset(&mbs, 0, sizeof(mbs)); while (insize != 0) { - nconv = mbrtowc(wcp, p, insize, &mbs); + nconv = mbrtowc(wcp, p, insize, NULL); if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2) break; wcp++; |
