From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 2 Dec 2000 23:09:01 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_2_1~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06f55c0c1d28a6ef1462c54a94988112070a0c50;p=thirdparty%2Fglibc.git

Update.

2000-12-02  H.J. Lu  <hjl@gnu.org>

	* locale/lc-time.c (_nl_init_era_entries): Pass L'\0' instead of
	'\0' to wcschr.
---

diff --git a/ChangeLog b/ChangeLog
index 71c4db430f3..b85c7d10bea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-02  H.J. Lu  <hjl@gnu.org>
+
+	* locale/lc-time.c (_nl_init_era_entries): Pass L'\0' instead of
+	'\0' to wcschr.
+
 2000-12-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/fpu/s_frexp.S: Add missing fwait.
diff --git a/locale/lc-time.c b/locale/lc-time.c
index 1e76e10c766..d8fd6cfc21b 100644
--- a/locale/lc-time.c
+++ b/locale/lc-time.c
@@ -121,11 +121,11 @@ _nl_init_era_entries (void)
 
 		  /* Set and skip wide era name.  */
 		  eras[cnt].era_wname = (wchar_t *) ptr;
-		  ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
+		  ptr = (char *) (wcschr ((wchar_t *) ptr, L'\0') + 1);
 
 		  /* Set and skip wide era format.  */
 		  eras[cnt].era_wformat = (wchar_t *) ptr;
-		  ptr = (char *) (wcschr ((wchar_t *) ptr, '\0') + 1);
+		  ptr = (char *) (wcschr ((wchar_t *) ptr, L'\0') + 1);
 		}
 	    }
 	}