[COMMITTED] Fix qsort argument order in collation example

Allan McRae allan@archlinux.org
Sat Apr 12 04:29:00 GMT 2014


---
 ChangeLog          | 7 +++++++
 NEWS               | 2 +-
 manual/string.texi | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2acfaf7..a42e08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-12  Allan McRae  <allan@archlinux.org>
+
+	[BZ #16838]
+	* manual/string.texi (Collation Functions): Fix qsort argument
+	order in example.
+	Reported by David C. Rankin <drankinatty@suddenlinkmail.com>.
+
 2014-04-11  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* math/test-fenv-preserve.c [FE_ALL_EXCEPT == 0] (do_test):
diff --git a/NEWS b/NEWS
index c751491..bbcc223 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ Version 2.20
   16610, 16611, 16613, 16623, 16632, 16634, 16639, 16642, 16648, 16649,
   16670, 16674, 16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707,
   16712, 16713, 16714, 16731, 16739, 16743, 16758, 16759, 16760, 16770,
-  16786, 16789, 16799, 16800, 16815.
+  16786, 16789, 16799, 16800, 16815, 16838.
 
 * Running the testsuite no longer terminates as soon as a test fails.
   Instead, a file tests.sum (xtests.sum from "make xcheck") is generated,
diff --git a/manual/string.texi b/manual/string.texi
index 4437ddd..ba5a2c7 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1572,8 +1572,8 @@ sort_strings_fast (char **array, int nstrings)
     @}
 
   /* @r{Sort @code{temp_array} by comparing transformed strings.} */
-  qsort (temp_array, sizeof (struct sorter),
-         nstrings, compare_elements);
+  qsort (temp_array, nstrings,
+         sizeof (struct sorter), compare_elements);
 
   /* @r{Put the elements back in the permanent array}
      @r{in their sorted order.} */
-- 
1.9.2



More information about the Libc-alpha mailing list