From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Jun 2012 00:51:27 +0000 (+0100)
Subject: scandir type fix
X-Git-Tag: debian/4.1.31~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=a6abbeaa21a10dc79344c4c1ce726fe819487f7f

scandir type fix
---

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 6a1bc3d..762b5d6 100644
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -319,8 +319,7 @@ static int recurse_filter(const struct dirent *de) {
   return 1;
 }
 
-static int recurse_compar(const void *av, const void *bv) {
-  const struct dirent *const *a=av, *const *b=bv;
+static int recurse_compar(const struct dirent **a, const struct dirent **b) {
   return strcmp((*a)->d_name, (*b)->d_name);
 }
 
diff --git a/debian/changelog b/debian/changelog
index f59d47f..64babee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ chiark-utils (4.1.31~~iwj) unstable; urgency=low
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.
 
+  * Fix the type of a callback function passed to scandir, to expect
+    struct dirent**'s rather than void*'s.
   * Add -Wno-pointer-sign to gcc warning options.
   * Fix the build-depends to refer to nettle-dev not libnettle-dev.
   * Add ${misc:Depends} to Depends: lines.  Causes no change to the .debs.