walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a typo and polish the previous change

This commit is contained in:
Akira TAGOH 2012-05-31 12:46:55 +09:00
parent 4a741e9a0a
commit 5254a6630f
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fcstat.c
View File

@ -26,6 +26,7 @@
#include "fcint.h" #include "fcint.h"
#include "fcarch.h" #include "fcarch.h"
#include <dirent.h> #include <dirent.h>
#include <limits.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -159,16 +160,14 @@ Adler32Finish (struct Adler32 *ctx)
return ctx->a + (ctx->b << 16); return ctx->a + (ctx->b << 16);
} }
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
/* dirent.d_type can be relied upon on FAT filesystem */ /* dirent.d_type can be relied upon on FAT filesystem */
static FcBool static FcBool
FcDirChecksumScandirFilter(const struct dirent *entry) FcDirChecksumScandirFilter(const struct dirent *entry)
{ {
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
return entry->d_type != DT_DIR; return entry->d_type != DT_DIR;
#else
return FcFalse;
#endif
} }
#endif
static int static int
FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs) FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs)
@ -189,7 +188,11 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
Adler32Init (&ctx); Adler32Init (&ctx);
n = scandir ((const char *)dir, &files, n = scandir ((const char *)dir, &files,
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
&FcDirChecksumScandirFilter, &FcDirChecksumScandirFilter,
#else
NULL,
#endif
&FcDirChecksumScandirSorter); &FcDirChecksumScandirSorter);
if (n == -1) if (n == -1)
return -1; return -1;
@ -203,14 +206,8 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
dtype = files[n]->d_type; dtype = files[n]->d_type;
#else #else
struct stat statb; struct stat statb;
char *f; char f[PATH_MAX + 1];
f = malloc (len + 1 + dlen + 1);
if (!f)
{
ret = -1;
goto bail;
}
memcpy (f, dir, len); memcpy (f, dir, len);
f[len] = FC_DIR_SEPARATOR; f[len] = FC_DIR_SEPARATOR;
memcpy (&f[len + 1], files[n]->d_name, dlen); memcpy (&f[len + 1], files[n]->d_name, dlen);
@ -230,8 +227,6 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
#ifndef HAVE_STRUCT_DIRENT_D_TYPE #ifndef HAVE_STRUCT_DIRENT_D_TYPE
bail: bail:
if (f)
free (f);
#endif #endif
free (files[n]); free (files[n]);
} }