system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

* stdlib/mbtowc.c (__no_r_state): Remove.

Browse Source 
(mbtowc): New static state variable.  Use it instead of 
__no_r_state. 
* stdlib/wctomb.c (__no_r_state): Remove extern decl. 
(__wctomb_state): New hidden variable. 
(wctomb): Use __wctomb_state instead of __no_r_state. 
* debug/wctomb_chk.c (__no_r_state): Remove extern decl. 
(__wctomb_state): New extern decl. 
(__wctomb_chk): Use __wctomb_state instead of __no_r_state.
2008-04-07  Jakub Jelinek  <jakub@redhat.com>

	* stdlib/mbtowc.c (__no_r_state): Remove.
	(mbtowc): New static state variable.  Use it instead of
	__no_r_state.
	* stdlib/wctomb.c (__no_r_state): Remove extern decl.
	(__wctomb_state): New hidden variable.
	(wctomb): Use __wctomb_state instead of __no_r_state.
	* debug/wctomb_chk.c (__no_r_state): Remove extern decl.
	(__wctomb_state): New extern decl.
	(__wctomb_chk): Use __wctomb_state instead of __no_r_state.
This commit is contained in:
Jakub Jelinek 2008-04-07 20:03:08 +00:00
parent fcf90e0a6f
commit 1e99aedece
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-04-07 Jakub Jelinek <jakub@redhat.com>
* stdlib/mbtowc.c (__no_r_state): Remove.
(mbtowc): New static state variable. Use it instead of
__no_r_state.
* stdlib/wctomb.c (__no_r_state): Remove extern decl.
(__wctomb_state): New hidden variable.
(wctomb): Use __wctomb_state instead of __no_r_state.
* debug/wctomb_chk.c (__no_r_state): Remove extern decl.
(__wctomb_state): New extern decl.
(__wctomb_chk): Use __wctomb_state instead of __no_r_state.
2008-04-07 Ulrich Drepper <drepper@redhat.com> 2008-04-07 Ulrich Drepper <drepper@redhat.com>
[BZ #5475] [BZ #5475]

6
debug/wctomb_chk.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2005 Free Software Foundation, Inc. /* Copyright (C) 2005, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -21,7 +21,7 @@
#include <wcsmbs/wcsmbsload.h> #include <wcsmbs/wcsmbsload.h>
extern mbstate_t __no_r_state attribute_hidden; /* Defined in mbtowc.c. */ extern mbstate_t __wctomb_state attribute_hidden; /* Defined in wctomb.c. */
int int
@ -32,5 +32,5 @@ __wctomb_chk (char *s, wchar_t wchar, size_t buflen)
if (buflen < MB_CUR_MAX) if (buflen < MB_CUR_MAX)
__chk_fail (); __chk_fail ();
return __wcrtomb (s, wchar, &__no_r_state); return __wcrtomb (s, wchar, &__wctomb_state);
} }

11
stdlib/mbtowc.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1995-1999, 2002, 2008
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -23,9 +24,6 @@
#include <wcsmbs/wcsmbsload.h> #include <wcsmbs/wcsmbsload.h>
/* Common state for all non-restartable conversion functions. */
mbstate_t __no_r_state attribute_hidden;
/* Convert the multibyte character at S, which is no longer /* Convert the multibyte character at S, which is no longer
than N characters, to its `wchar_t' representation, placing than N characters, to its `wchar_t' representation, placing
this n *PWC and returning its length. this n *PWC and returning its length.
@ -38,6 +36,7 @@ int
mbtowc (wchar_t *pwc, const char *s, size_t n) mbtowc (wchar_t *pwc, const char *s, size_t n)
{ {
int result; int result;
static mbstate_t state;
/* If S is NULL the function has to return null or not null /* If S is NULL the function has to return null or not null
depending on the encoding having a state depending encoding or depending on the encoding having a state depending encoding or
@ -51,7 +50,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
/* This is an extension in the Unix standard which does not directly /* This is an extension in the Unix standard which does not directly
violate ISO C. */ violate ISO C. */
memset (&__no_r_state, '\0', sizeof __no_r_state); memset (&state, '\0', sizeof state);
result = fcts->towc->__stateful; result = fcts->towc->__stateful;
} }
@ -63,7 +62,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
} }
else else
{ {
result = __mbrtowc (pwc, s, n, &__no_r_state); result = __mbrtowc (pwc, s, n, &state);
/* The `mbrtowc' functions tell us more than we need. Fold the -1 /* The `mbrtowc' functions tell us more than we need. Fold the -1
and -2 result into -1. */ and -2 result into -1. */

10
stdlib/wctomb.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1995-1999, 2002, 2008
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -23,7 +24,8 @@
#include <wcsmbs/wcsmbsload.h> #include <wcsmbs/wcsmbsload.h>
extern mbstate_t __no_r_state attribute_hidden; /* Defined in mbtowc.c. */ /* Shared with __wctomb_chk. */
mbstate_t __wctomb_state attribute_hidden;
/* Convert WCHAR into its multibyte character representation, /* Convert WCHAR into its multibyte character representation,
putting this in S and returning its length. putting this in S and returning its length.
@ -47,11 +49,11 @@ wctomb (char *s, wchar_t wchar)
/* This is an extension in the Unix standard which does not directly /* This is an extension in the Unix standard which does not directly
violate ISO C. */ violate ISO C. */
memset (&__no_r_state, '\0', sizeof __no_r_state); memset (&__wctomb_state, '\0', sizeof __wctomb_state);
return fcts->tomb->__stateful; return fcts->tomb->__stateful;
} }
return __wcrtomb (s, wchar, &__no_r_state); return __wcrtomb (s, wchar, &__wctomb_state);
} }
libc_hidden_def (wctomb) libc_hidden_def (wctomb)