diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-03-15 21:33:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-03-15 21:33:19 +0000 |
| commit | eee6b1432794967d4272394dfed1e2b5cca4be39 (patch) | |
| tree | 23224c276f09d0b733872790fa41c1a4cbe76787 /dirent/scandir.c | |
| parent | cd2d01faa53a48640e97d55aa0bf2fee99a7c8cb (diff) | |
| download | glibc-eee6b1432794967d4272394dfed1e2b5cca4be39.tar.gz glibc-eee6b1432794967d4272394dfed1e2b5cca4be39.tar.xz glibc-eee6b1432794967d4272394dfed1e2b5cca4be39.zip | |
[BZ #9759]
* dirent/dirent.h: Adjust prototypes of scandir, scandir64, alphasort, alphasort64, versionsort, and versionsort64 to POSIX 2008. * dirent/alphasort.c: Adjust implementation to type change. * dirent/alphasort64.c: Likewise. * dirent/scandir.c: Likewise. * dirent/versionsort.c: Likewise. * dirent/versionsort64.c: Likewise. * sysdeps/wordsize-64/alphasort.c: Add hack to hide alphasort64 declaration. * sysdeps/wordsize-64/versionsort.c: Add hack to hide versionsort64 declaration.
Diffstat (limited to 'dirent/scandir.c')
| -rw-r--r-- | dirent/scandir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dirent/scandir.c b/dirent/scandir.c index 89bd9e94fe..2e03578a3c 100644 --- a/dirent/scandir.c +++ b/dirent/scandir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-1998, 2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1992-1998,2000,2002,2003,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -57,7 +57,7 @@ SCANDIR (dir, namelist, select, cmp) const char *dir; DIRENT_TYPE ***namelist; int (*select) (const DIRENT_TYPE *); - int (*cmp) (const void *, const void *); + int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **); { DIR *dp = __opendir (dir); DIRENT_TYPE **v = NULL; @@ -134,7 +134,8 @@ SCANDIR (dir, namelist, select, cmp) { /* Sort the list if we have a comparison function to sort with. */ if (cmp != NULL) - qsort (v, c.cnt, sizeof (*v), cmp); + qsort (v, c.cnt, sizeof (*v), + (int (*) (const void *, const void *)) cmp); *namelist = v; } |