summaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-04-07 20:03:08 +0000
committerJakub Jelinek <jakub@redhat.com>2008-04-07 20:03:08 +0000
commit1e99aedece40907ea7f2a392f3e98df75f23011e (patch)
tree0be45eb7a47f5cbae7c5be57c393637f4998426c /debug
parentfcf90e0a6fe37149f0b9000c6611d4da4d5a7a64 (diff)
downloadglibc-1e99aedece40907ea7f2a392f3e98df75f23011e.tar.gz
* 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 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.
Diffstat (limited to 'debug')
-rw-r--r--debug/wctomb_chk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/debug/wctomb_chk.c b/debug/wctomb_chk.c
index d0366346b8..23fc2ffbd1 100644
--- a/debug/wctomb_chk.c
+++ b/debug/wctomb_chk.c
@@ -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.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#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
@@ -32,5 +32,5 @@ __wctomb_chk (char *s, wchar_t wchar, size_t buflen)
if (buflen < MB_CUR_MAX)
__chk_fail ();
- return __wcrtomb (s, wchar, &__no_r_state);
+ return __wcrtomb (s, wchar, &__wctomb_state);
}