From b70ecc4de11cf61852b15d2e2e46073602706bd0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 6 Mar 2003 14:14:16 +0000 Subject: Fix a bug that causes du to dump core on 64-bit systems. (ftw_startup): Declare `func' parameter to be of type NFTW_FUNC_T, not void* which may be smaller on 64-bit systems. Remove now-unnecessary cast. (FTW_NAME): Cast func argument to type `NFTW_FUNC_T'. --- lib/ftw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ftw.c b/lib/ftw.c index 677e6ff76..2161b89b5 100644 --- a/lib/ftw.c +++ b/lib/ftw.c @@ -636,7 +636,7 @@ base_name (char const *name) static int internal_function -ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, +ftw_startup (const char *dir, int is_nftw, NFTW_FUNC_T func, int descriptors, int flags) { struct ftw_data data; @@ -682,7 +682,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, every case the callback using the format of the `nftw' version and get the correct result since the stack layout for a function call in C allows this. */ - data.func = (NFTW_FUNC_T) func; + data.func = func; /* Since we internally use the complete set of FTW_* values we need to reduce the value range before calling a `ftw' callback. */ @@ -799,7 +799,7 @@ FTW_NAME (path, func, descriptors) FTW_FUNC_T func; int descriptors; { - return ftw_startup (path, 0, func, descriptors, 0); + return ftw_startup (path, 0, (NFTW_FUNC_T) func, descriptors, 0); } int -- cgit v1.2.3-70-g09d2