[Emacs-diffs] /srv/bzr/emacs/trunk r100702: Fix invalid cast

[Andreas Schwab]

------------------------------------------------------------
revno: 100702
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2010-07-03 14:11:03 +0200
message:
  Fix invalid cast
  
  * sorted-doc.c (cmpdoc): Fix signature.
  (qsort_compare): Delete.
  (main): Remove cast.
modified:
  lib-src/ChangeLog
  lib-src/sorted-doc.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-07-03 10:46:27 +0000
+++ b/lib-src/ChangeLog 2010-07-03 12:11:03 +0000
@@ -1,3 +1,9 @@
+2010-07-03  Andreas Schwab  <address@hidden>
+
+       * sorted-doc.c (cmpdoc): Fix signature.
+       (qsort_compare): Delete.
+       (main): Remove cast.
+
 2010-07-03  Juanma Barranquero  <address@hidden>
 
        * ebrowse.c (match_qualified_namespace_alias): Check for null pointer.

=== modified file 'lib-src/sorted-doc.c'
--- a/lib-src/sorted-doc.c      2010-07-03 07:44:17 +0000
+++ b/lib-src/sorted-doc.c      2010-07-03 12:11:03 +0000
@@ -103,15 +103,15 @@
 /* Comparison function for qsort to call.  */
 
 int
-cmpdoc (DOCSTR **a, DOCSTR **b)
+cmpdoc (const void *va, const void *vb)
 {
+  DOCSTR *const *a = va;
+  DOCSTR *const *b = vb;
   register int val = strcmp ((*a)->name, (*b)->name);
   if (val) return val;
   return (*a)->type - (*b)->type;
 }
 
-typedef int (*qsort_compare) (const void *, const void *);
-
 enum state
 {
   WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET
@@ -228,7 +228,7 @@
 
     /* sort the array by name; within each name, by type */
 
-    qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc);
+    qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc);
 
     /* write the output header */