lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Update.

Browse Source 
1999-07-28  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/mblen.c: Use static state.
	Reported by Bruno Haible <haible@ilog.fr>.

	* stdlib/mbtowc.c: Reset state for s == NULL.
	* stdlib/wctomb.c: Likewise.
	Reported by Bruno Haible <haible@ilog.fr>.

	* stdlib/mbstowcs.c: Do not use global state.
	Reported by Bruno Haible <haible@ilog.fr>.
This commit is contained in:
Ulrich Drepper
1999-07-28 19:37:40 +00:00
parent 97a0d44d89
commit 9f097308c7
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
stdlib/mbstowcs.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -17,11 +17,10 @@
Boston, MA 02111-1307, USA. */
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
/* Convert the string of multibyte characters in S to `wchar_t's in
PWCS, writing no more than N. Return the number written,
or (size_t) -1 if an invalid multibyte character is encountered.
@ -33,14 +32,9 @@ extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
size_t
mbstowcs (wchar_t *pwcs, const char *s, size_t n)
{
mbstate_t save_shift = __no_r_state;
size_t written;
written = __mbsrtowcs (pwcs, &s, n, &__no_r_state);
/* Restore the old shift state. */
__no_r_state = save_shift;
mbstate_t state;
memset (&state, '\0', sizeof state);
/* Return how many we wrote (or maybe an error). */
return written;
return __mbsrtowcs (pwcs, &s, n, &state);
}