From: Andreas Schwab Date: Sat, 3 Jul 2010 12:11:03 +0000 (+0200) Subject: Fix invalid cast X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81^2~51 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a52a00a3d745844419d93209ddec1c4236aed22a;p=emacs.git Fix invalid cast * sorted-doc.c (cmpdoc): Fix signature. (qsort_compare): Delete. (main): Remove cast. --- diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 939f3f219ec..e80ca8a4cc2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2010-07-03 Andreas Schwab + + * sorted-doc.c (cmpdoc): Fix signature. + (qsort_compare): Delete. + (main): Remove cast. + 2010-07-03 Juanma Barranquero * ebrowse.c (match_qualified_namespace_alias): Check for null pointer. diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 2c138dc348c..595633b76d8 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -103,15 +103,15 @@ xstrdup (char *str) /* 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 @@ main (void) /* 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 */