Page MenuHomeFreeBSD
Files F156873122

D36708.id110966.diff
No OneTemporary
Actions

D36708.id110966.diff
View Options

diff --git a/lib/libc/gen/scandir-compat11.c b/lib/libc/gen/scandir-compat11.c
--- a/lib/libc/gen/scandir-compat11.c
+++ b/lib/libc/gen/scandir-compat11.c
@@ -58,7 +58,7 @@
#define SELECT(x) select(x)
-static int freebsd11_alphasort_thunk(void *thunk, const void *p1,
+static int freebsd11_scandir_thunk_cmp(void *thunk, const void *p1,
const void *p2);
int
@@ -116,7 +116,7 @@
closedir(dirp);
if (numitems && dcomp != NULL)
qsort_r(names, numitems, sizeof(struct freebsd11_dirent *),
- &dcomp, freebsd11_alphasort_thunk);
+ &dcomp, freebsd11_scandir_thunk_cmp);
*namelist = names;
return (numitems);
@@ -141,7 +141,7 @@
}
static int
-freebsd11_alphasort_thunk(void *thunk, const void *p1, const void *p2)
+freebsd11_scandir_thunk_cmp(void *thunk, const void *p1, const void *p2)
{
int (*dc)(const struct freebsd11_dirent **, const struct
freebsd11_dirent **);
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -63,7 +63,7 @@
typedef DECLARE_BLOCK(int, dcomp_block, const struct dirent **,
const struct dirent **);
#else
-static int alphasort_thunk(void *thunk, const void *p1, const void *p2);
+static int scandir_thunk_cmp(void *thunk, const void *p1, const void *p2);
#endif
static int
@@ -123,7 +123,7 @@
qsort_b(names, numitems, sizeof(struct dirent *), (void*)dcomp);
#else
qsort_r(names, numitems, sizeof(struct dirent *),
- &dcomp, alphasort_thunk);
+ &dcomp, scandir_thunk_cmp);
#endif
*namelist = names;
return (numitems);
@@ -199,7 +199,7 @@
}
static int
-alphasort_thunk(void *thunk, const void *p1, const void *p2)
+scandir_thunk_cmp(void *thunk, const void *p1, const void *p2)
{
int (*dc)(const struct dirent **, const struct dirent **);

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 12:36 AM (8 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33222761
Default Alt Text
D36708.id110966.diff (1 KB)

Event Timeline