summaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-04-08 07:59:52 +0000
committerJakub Jelinek <jakub@redhat.com>2008-04-08 07:59:52 +0000
commite6e467b8352b6a62b8187fd241671eb55d0f6fc4 (patch)
tree2e7c2ddae1aa58a70c384e1d5b49d3ad198a2718 /stdlib
parent09b731ac2b1b5e79050991f6a9dab964f9a7a60f (diff)
Updated to fedora-glibc-20080408T0706
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/mbtowc.c11
-rw-r--r--stdlib/strtod_l.c2
-rw-r--r--stdlib/wctomb.c10
3 files changed, 12 insertions, 11 deletions
diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c
index 744b2b6c0b..ee8850bbc1 100644
--- a/stdlib/mbtowc.c
+++ b/stdlib/mbtowc.c
@@ -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.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,9 +24,6 @@
#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
than N characters, to its `wchar_t' representation, placing
this n *PWC and returning its length.
@@ -38,6 +36,7 @@ int
mbtowc (wchar_t *pwc, const char *s, size_t n)
{
int result;
+ static mbstate_t state;
/* If S is NULL the function has to return null or not null
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
violate ISO C. */
- memset (&__no_r_state, '\0', sizeof __no_r_state);
+ memset (&state, '\0', sizeof state);
result = fcts->towc->__stateful;
}
@@ -63,7 +62,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
}
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
and -2 result into -1. */
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index 9c2f86a32b..09a8f9bb3b 100644
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -1028,7 +1028,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
if (__builtin_expect (exponent < MIN_10_EXP - (DIG + 1), 0))
{
__set_errno (ERANGE);
- return 0.0;
+ return negative ? -0.0 : 0.0;
}
if (int_no > 0)
diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c
index 49872f5c6b..3ba8a3e2a7 100644
--- a/stdlib/wctomb.c
+++ b/stdlib/wctomb.c
@@ -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.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +24,8 @@
#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,
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
violate ISO C. */
- memset (&__no_r_state, '\0', sizeof __no_r_state);
+ memset (&__wctomb_state, '\0', sizeof __wctomb_state);
return fcts->tomb->__stateful;
}
- return __wcrtomb (s, wchar, &__no_r_state);
+ return __wcrtomb (s, wchar, &__wctomb_state);
}
libc_hidden_def (wctomb)