summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-04-12 14:26:29 +1000
committerAllan McRae <allan@archlinux.org>2014-04-12 14:26:29 +1000
commit89e691f2ae498c6d6eac34cccda0bdcaca13717e (patch)
tree6dd1ae8c28414543ae3082b6e248b0b07e0d9e97
parentfe8d072cb7b7ce37acb2586b3c0269d1c47ecb6d (diff)
downloadglibc-89e691f2ae498c6d6eac34cccda0bdcaca13717e.tar.gz
Fix qsort argument order in collation example
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--manual/string.texi4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2acfaf7e30..a42e08eec2 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 c751491b81..bbcc2232b0 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 4437dddd47..ba5a2c7ba5 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.} */