summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9d6f4f0)
Newer gcc is better at detecting set-but-unused variables.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
FcSerialize *serialize = FcSerializeCreate ();
FcCache *cache;
int i;
FcSerialize *serialize = FcSerializeCreate ();
FcCache *cache;
int i;
- intptr_t cache_offset;
- intptr_t dirs_offset;
FcChar8 *dir_serialize;
intptr_t *dirs_serialize;
FcFontSet *set_serialize;
FcChar8 *dir_serialize;
intptr_t *dirs_serialize;
FcFontSet *set_serialize;
/*
* Space for cache structure
*/
/*
* Space for cache structure
*/
- cache_offset = FcSerializeReserve (serialize, sizeof (FcCache));
+ FcSerializeReserve (serialize, sizeof (FcCache));
- dirs_offset = FcSerializeAlloc (serialize, dirs, dirs->num * sizeof (FcChar8 *));
+ FcSerializeAlloc (serialize, dirs, dirs->num * sizeof (FcChar8 *));
for (i = 0; i < dirs->num; i++)
if (!FcStrSerializeAlloc (serialize, dirs->strs[i]))
goto bail1;
for (i = 0; i < dirs->num; i++)
if (!FcStrSerializeAlloc (serialize, dirs->strs[i]))
goto bail1;
FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
{
FcStrSet *dirs;
FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
{
FcStrSet *dirs;
FcFontSet *set;
FcCache *cache = NULL;
struct stat dir_stat;
FcFontSet *set;
FcCache *cache = NULL;
struct stat dir_stat;
printf ("cache scan dir %s\n", dir);
if (FcStat (dir, &dir_stat) < 0)
printf ("cache scan dir %s\n", dir);
if (FcStat (dir, &dir_stat) < 0)
- {
- if (errno != ENOENT)
- ret = FcFalse;
set = FcFontSetCreate();
if (!set)
set = FcFontSetCreate();
if (!set)
dirs = FcStrSetCreate ();
if (!dirs)
dirs = FcStrSetCreate ();
if (!dirs)
/*
* Scan the dir
*/
if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config))
/*
* Scan the dir
*/
if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config))
/*
* Build the cache object
*/
cache = FcDirCacheBuild (set, dir, &dir_stat, dirs);
if (!cache)
/*
* Build the cache object
*/
cache = FcDirCacheBuild (set, dir, &dir_stat, dirs);
if (!cache)
/*
* Write out the cache file, ignoring any troubles
/*
* Write out the cache file, ignoring any troubles
static FcBool
skip_percent (FcFormatContext *c)
{
static FcBool
skip_percent (FcFormatContext *c)
{
if (!expect_char (c, '%'))
return FcFalse;
/* skip an optional width specifier */
if (!expect_char (c, '%'))
return FcFalse;
/* skip an optional width specifier */
- width = strtol ((const char *) c->format, (char **) &c->format, 10);
+ strtol ((const char *) c->format, (char **) &c->format, 10);
if (!expect_char (c, '{'))
return FcFalse;
if (!expect_char (c, '{'))
return FcFalse;
FT_Stream stream = face->stream;
FT_Error error;
FT_UShort n, p;
FT_Stream stream = face->stream;
FT_Error error;
FT_UShort n, p;
int script_count;
if (!stream)
return 0;
int script_count;
if (!stream)
return 0;
- memory = stream->memory;
-
if (( error = ftglue_face_goto_table( face, tabletag, stream ) ))
return 0;
if (( error = ftglue_face_goto_table( face, tabletag, stream ) ))
return 0;