Fix typo in strcoll example

diff --git a/ChangeLog b/ChangeLog
index 496a236f093f0a059f039007fd67a1d800a7e31a..9b73de5cb970d28bd2895635844716c334011524 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-09-09  Allan McRae  <allan@archlinux.org>
 
+       [BZ #15939]
+       * manual/string.texi (Collation Functions): Fix typo in
+       strcoll example.
+       Reported by Suren Karapetyan <me@suren.karapetyan.name>.
+
        [BZ #15893]
        * stdlib/isomac.c (get_null_defines): Fix memory leak.
 

diff --git a/NEWS b/NEWS
index 9d128ae5655c80e828b4b13dc1c9815c6d0911a1..e3eb389822a3c49daa0800d7c8fac941a326946b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.19
 
   14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
   15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
-  15921.
+  15921, 15939.
 
 * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
   to the d_name member of struct dirent, or omit the terminating NUL

diff --git a/manual/string.texi b/manual/string.texi
index 2a164a9523b5bc1de10bc55b2f033a6e25bcf329..3329761fc978186de52d67f794cff1849b4d65ed 100644 (file)
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1370,7 +1370,7 @@ int
 compare_elements (const void *v1, const void *v2)
 @{
   char * const *p1 = v1;
-  char * const *p1 = v2;
+  char * const *p2 = v2;
 
   return strcoll (*p1, *p2);
 @}