Give the fts_compar struct member a real prototype.

This adds clarity and avoids compiler warnings.

diff --git a/compat_fts.c b/compat_fts.c
index 3859111a52f89708d33b697d598b00850e3b1f46..0106923a561c9c71743008b5f22ea865a298097e 100644 (file)
--- a/compat_fts.c
+++ b/compat_fts.c
@@ -6,7 +6,7 @@ int dummy;
 
 #else
 
-/*     $Id: compat_fts.c,v 1.14 2017/02/18 12:24:24 schwarze Exp $     */
+/*     $Id: compat_fts.c,v 1.15 2020/06/14 22:49:36 schwarze Exp $     */
 /*     $OpenBSD: fts.c,v 1.56 2016/09/21 04:38:56 guenther Exp $       */
 
 /*-
@@ -62,6 +62,8 @@ static int     fts_palloc(FTS *, size_t);
 static FTSENT  *fts_sort(FTS *, FTSENT *, int);
 static unsigned short   fts_stat(FTS *, FTSENT *);
 
+typedef int (*qsort_compar_proto)(const void *, const void *);
+
 #define        ISDOT(a)        (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
 #ifndef        O_CLOEXEC
 #define        O_CLOEXEC       0
@@ -585,7 +587,8 @@ fts_sort(FTS *sp, FTSENT *head, int nitems)
        }
        for (ap = sp->fts_array, p = head; p; p = p->fts_link)
                *ap++ = p;
-       qsort(sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
+       qsort(sp->fts_array, nitems, sizeof(FTSENT *),
+           (qsort_compar_proto)sp->fts_compar);
        for (head = *(ap = sp->fts_array); --nitems; ++ap)
                ap[0]->fts_link = ap[1];
        ap[0]->fts_link = NULL;

diff --git a/compat_fts.h b/compat_fts.h
index f4a97a4c3a56de634a9a4038a90e28a713568916..ca3f3a7ed804fa8207d3dcf774ca7ece72a60d38 100644 (file)
--- a/compat_fts.h
+++ b/compat_fts.h
@@ -43,7 +43,8 @@ typedef struct {
        char *fts_path;                 /* path for this descent */
        size_t fts_pathlen;             /* sizeof(path) */
        int fts_nitems;                 /* elements in the sort array */
-       int (*fts_compar)();            /* compare function */
+       int (*fts_compar)(const struct _ftsent **, const struct _ftsent **);
+                                       /* compare function */
 
 #define        FTS_NOCHDIR     0x0004          /* don't change directories */
 #define        FTS_PHYSICAL    0x0010          /* physical walk */