Fix qsort argument order in collation example

diff --git a/ChangeLog b/ChangeLog
index 2acfaf7e3023bfbdc2e7c40d0c18bf028f3432af..a42e08eec2c486c0d3481e5b143484bf55fce076 100644 (file)
--- 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 c751491b817c12714676c2c0073f1ce086a6f199..bbcc2232b03f2d07774246c3dd66e33e19725484 100644 (file)
--- 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 4437dddd47f1ca32f9d697e324b1d6e8febe2898..ba5a2c7ba507281133330783b7aefb7b5cfa4324 100644 (file)
--- 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.} */