This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-296-g9cd8330
- From: neleai at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Oct 2013 12:37:27 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-296-g9cd8330
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 9cd8330240f930c5509592cd8d57133e52ac30e7 (commit)
from b7ea74f0747456c99421f14f963082b1dcb6c30d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9cd8330240f930c5509592cd8d57133e52ac30e7
commit 9cd8330240f930c5509592cd8d57133e52ac30e7
Author: Reuben Thomas <rrt@sc3d.org>
Date: Sat Oct 12 14:07:25 2013 +0200
Fix typo in setlocale.c. Fixes BZ #15764
diff --git a/ChangeLog b/ChangeLog
index db2c7eb..1c0d1ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-12 Reuben Thomas <rrt@sc3d.org>
+
+ [BZ #15764]
+ * locale/setlocale.c: Fix typo.
+
2013-10-12 Joseph Myers <joseph@codesourcery.com>
[BZ #16036]
diff --git a/NEWS b/NEWS
index d617ae7..deb7f19 100644
--- a/NEWS
+++ b/NEWS
@@ -11,10 +11,11 @@ Version 2.19
156, 431, 13982, 13985, 14155, 14547, 14699, 14910, 15048, 15362, 15400,
15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632, 15640, 15680,
- 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15797,
- 15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890,
- 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939,
- 15963, 15966, 15988, 16032, 16034, 16036.
+ 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764,
+ 15797, 15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
+ 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
+ 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
+ 15939, 15963, 15966, 15988, 16032, 16034, 16036.
* CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache
diff --git a/locale/setlocale.c b/locale/setlocale.c
index be95519..e83a156 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -412,7 +412,7 @@ setlocale (int category, const char *locale)
/* We must not simply free a global locale since we have no
control over the usage. So we mark it as un-deletable.
- Note: do not remove the `if', it's necessary to copy with
+ Note: do not remove the `if', it's necessary to cope with
the builtin locale data. */
if (newdata->usage_count != UNDELETABLE)
newdata->usage_count = UNDELETABLE;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 9 +++++----
locale/setlocale.c | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources