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

delete unused variables 

Newer gcc is better at detecting set-but-unused variables.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-11-07 15:18:26 -05:00
parent 6f020161e8
commit e3a66c2937
4 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fccache.c
View File

@ -727,8 +727,6 @@ FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcSt
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;
@ -738,7 +736,7 @@ FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcSt
/*
* Space for cache structure
*/
cache_offset = FcSerializeReserve (serialize, sizeof (FcCache));
FcSerializeReserve (serialize, sizeof (FcCache));
/*
* Directory name
*/
@ -747,7 +745,7 @@ FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcSt
/*
* Subdirs
*/
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;

17
src/fcdir.c
View File

@ -235,7 +235,6 @@ FcCache *
FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
{
FcStrSet *dirs;
FcBool ret = FcTrue;
FcFontSet *set;
FcCache *cache = NULL;
struct stat dir_stat;
@ -244,44 +243,28 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
printf ("cache scan dir %s\n", dir);
if (FcStat (dir, &dir_stat) < 0)
{
if (errno != ENOENT)
ret = FcFalse;
goto bail;
}
set = FcFontSetCreate();
if (!set)
{
ret = FcFalse;
goto bail;
}
dirs = FcStrSetCreate ();
if (!dirs)
{
ret = FcFalse;
goto bail1;
}
/*
* Scan the dir
*/
if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config))
{
ret = FcFalse;
goto bail2;
}
/*
* Build the cache object
*/
cache = FcDirCacheBuild (set, dir, &dir_stat, dirs);
if (!cache)
{
ret = FcFalse;
goto bail2;
}
/*
* Write out the cache file, ignoring any troubles

5
src/fcformat.c
View File

@ -353,13 +353,12 @@ skip_subexpr (FcFormatContext *c);
static FcBool
skip_percent (FcFormatContext *c)
{
int width;
if (!expect_char (c, '%'))
return FcFalse;
/* skip an optional width specifier */
width = strtol ((const char *) c->format, (char **) &c->format, 10);
if (strtol ((const char *) c->format, (char **) &c->format, 10))
/* don't care */;
if (!expect_char (c, '{'))
return FcFalse;

3
src/fcfreetype.c
View File

@ -2609,14 +2609,11 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags)
FT_Stream stream = face->stream;
FT_Error error;
FT_UShort n, p;
FT_Memory memory;
int script_count;
if (!stream)
return 0;
memory = stream->memory;
if (( error = ftglue_face_goto_table( face, tabletag, stream ) ))
return 0;