ret won't be -1 if HAVE_STRUCT_DIRENT_D_TYPE isn't defined.
This commit is contained in:
Akira TAGOH 2012-12-11 12:30:05 +09:00
parent 36265aeebd
commit cef2b50c66
1 changed files with 4 additions and 1 deletions

View File

@ -178,8 +178,9 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
{ {
struct Adler32 ctx; struct Adler32 ctx;
struct dirent **files; struct dirent **files;
int n, ret = 0; int n;
#ifndef HAVE_STRUCT_DIRENT_D_TYPE #ifndef HAVE_STRUCT_DIRENT_D_TYPE
int ret = 0;
size_t len = strlen ((const char *)dir); size_t len = strlen ((const char *)dir);
#endif #endif
@ -229,8 +230,10 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
free (files[n]); free (files[n]);
} }
free (files); free (files);
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
if (ret == -1) if (ret == -1)
return -1; return -1;
#endif
*checksum = Adler32Finish (&ctx); *checksum = Adler32Finish (&ctx);