scandir type fix

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 6a1bc3d9bb5106f0e67126fda719cc252a1bfe31..762b5d68812ac0b5e20d86ce65745bb40b6a5e06 100644 (file)
--- 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 f59d47fee5768f1a2c38ea22f539d8a089c68a6e..64babeea81c667b6fa7ba99e17b874b3c97e0d7e 100644 (file)
--- 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.