Fix unused-parameter warnings

This commit is contained in:
Behdad Esfahbod 2012-12-29 22:32:56 -05:00
parent 24cdcf52ab
commit 83d8019011
9 changed files with 26 additions and 21 deletions

View File

@ -66,7 +66,7 @@ FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
int int
main (int argc, char **argv) main (int argc FC_UNUSED, char **argv FC_UNUSED)
{ {
printf ("%s\n", FC_ARCHITECTURE); printf ("%s\n", FC_ARCHITECTURE);
return 0; return 0;

View File

@ -666,7 +666,7 @@ FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat)
* the magic number and the size field * the magic number and the size field
*/ */
static FcBool static FcBool
FcDirCacheValidateHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure) FcDirCacheValidateHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure FC_UNUSED)
{ {
FcBool ret = FcTrue; FcBool ret = FcTrue;
FcCache c; FcCache c;

View File

@ -510,7 +510,7 @@ FcConfigGetConfigFiles (FcConfig *config)
} }
FcChar8 * FcChar8 *
FcConfigGetCache (FcConfig *config) FcConfigGetCache (FcConfig *config FC_UNUSED)
{ {
return NULL; return NULL;
} }

View File

@ -1190,7 +1190,7 @@ FcCharSetFreezeOrig (FcCharSetFreezer *freezer, const FcCharSet *orig, const FcC
} }
static FcCharSet * static FcCharSet *
FcCharSetFreezeBase (FcCharSetFreezer *freezer, FcCharSet *fcs, const FcCharSet *orig) FcCharSetFreezeBase (FcCharSetFreezer *freezer, FcCharSet *fcs)
{ {
FcChar32 hash = FcCharSetHash (fcs); FcChar32 hash = FcCharSetHash (fcs);
FcCharSetEnt **bucket = &freezer->set_hash_table[hash % FC_CHAR_SET_HASH_SIZE]; FcCharSetEnt **bucket = &freezer->set_hash_table[hash % FC_CHAR_SET_HASH_SIZE];
@ -1289,7 +1289,7 @@ FcCharSetFreeze (FcCharSetFreezer *freezer, const FcCharSet *fcs)
if (!FcCharSetInsertLeaf (b, FcCharSetNumbers(fcs)[i] << 8, l)) if (!FcCharSetInsertLeaf (b, FcCharSetNumbers(fcs)[i] << 8, l))
goto bail1; goto bail1;
} }
n = FcCharSetFreezeBase (freezer, b, fcs); n = FcCharSetFreezeBase (freezer, b);
if (!FcCharSetFreezeOrig (freezer, fcs, n)) if (!FcCharSetFreezeOrig (freezer, fcs, n))
{ {
n = NULL; n = NULL;

View File

@ -126,10 +126,10 @@ FcFileScanConfig (FcFontSet *set,
FcBool FcBool
FcFileScan (FcFontSet *set, FcFileScan (FcFontSet *set,
FcStrSet *dirs, FcStrSet *dirs,
FcFileCache *cache, /* XXX unused */ FcFileCache *cache FC_UNUSED,
FcBlanks *blanks, FcBlanks *blanks,
const FcChar8 *file, const FcChar8 *file,
FcBool force) FcBool force FC_UNUSED)
{ {
return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ()); return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ());
} }
@ -316,7 +316,7 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
} }
FcBool FcBool
FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir) FcDirSave (FcFontSet *set FC_UNUSED, FcStrSet * dirs FC_UNUSED, const FcChar8 *dir FC_UNUSED)
{ {
return FcFalse; /* XXX deprecated */ return FcFalse; /* XXX deprecated */
} }

View File

@ -790,7 +790,7 @@ interpret_simple (FcFormatContext *c,
} }
static FcBool static FcBool
cescape (FcFormatContext *c, cescape (FcFormatContext *c FC_UNUSED,
const FcChar8 *str, const FcChar8 *str,
FcStrBuf *buf) FcStrBuf *buf)
{ {
@ -811,7 +811,7 @@ cescape (FcFormatContext *c,
} }
static FcBool static FcBool
shescape (FcFormatContext *c, shescape (FcFormatContext *c FC_UNUSED,
const FcChar8 *str, const FcChar8 *str,
FcStrBuf *buf) FcStrBuf *buf)
{ {
@ -829,7 +829,7 @@ shescape (FcFormatContext *c,
} }
static FcBool static FcBool
xmlescape (FcFormatContext *c, xmlescape (FcFormatContext *c FC_UNUSED,
const FcChar8 *str, const FcChar8 *str,
FcStrBuf *buf) FcStrBuf *buf)
{ {

View File

@ -69,6 +69,12 @@ extern pfnSHGetFolderPathA pSHGetFolderPathA;
# define FC_DIR_SEPARATOR_S "/" # define FC_DIR_SEPARATOR_S "/"
#endif #endif
#if __GNUC__ >= 4
#define FC_UNUSED __attribute__((unused))
#else
#define FC_UNUSED
#endif
#define FC_DBG_MATCH 1 #define FC_DBG_MATCH 1
#define FC_DBG_MATCHV 2 #define FC_DBG_MATCHV 2
#define FC_DBG_EDIT 4 #define FC_DBG_EDIT 4

View File

@ -563,8 +563,7 @@ FcFontRenderPrepare (FcConfig *config,
} }
static FcPattern * static FcPattern *
FcFontSetMatchInternal (FcConfig *config, FcFontSetMatchInternal (FcFontSet **sets,
FcFontSet **sets,
int nsets, int nsets,
FcPattern *p, FcPattern *p,
FcResult *result) FcResult *result)
@ -658,7 +657,7 @@ FcFontSetMatch (FcConfig *config,
if (!config) if (!config)
return 0; return 0;
} }
best = FcFontSetMatchInternal (config, sets, nsets, p, result); best = FcFontSetMatchInternal (sets, nsets, p, result);
if (best) if (best)
return FcFontRenderPrepare (config, p, best); return FcFontRenderPrepare (config, p, best);
else else
@ -691,7 +690,7 @@ FcFontMatch (FcConfig *config,
if (config->fonts[FcSetApplication]) if (config->fonts[FcSetApplication])
sets[nsets++] = config->fonts[FcSetApplication]; sets[nsets++] = config->fonts[FcSetApplication];
best = FcFontSetMatchInternal (config, sets, nsets, p, result); best = FcFontSetMatchInternal (sets, nsets, p, result);
if (best) if (best)
return FcFontRenderPrepare (config, p, best); return FcFontRenderPrepare (config, p, best);
else else
@ -794,7 +793,7 @@ FcFontSetSortDestroy (FcFontSet *fs)
} }
FcFontSet * FcFontSet *
FcFontSetSort (FcConfig *config, FcFontSetSort (FcConfig *config FC_UNUSED,
FcFontSet **sets, FcFontSet **sets,
int nsets, int nsets,
FcPattern *p, FcPattern *p,

View File

@ -2541,7 +2541,7 @@ FcParsePattern (FcConfigParse *parse)
} }
static void static void
FcEndElement(void *userData, const XML_Char *name) FcEndElement(void *userData, const XML_Char *name FC_UNUSED)
{ {
FcConfigParse *parse = userData; FcConfigParse *parse = userData;
FcChar8 *data; FcChar8 *data;
@ -2733,9 +2733,9 @@ FcCharacterData (void *userData, const XML_Char *s, int len)
static void static void
FcStartDoctypeDecl (void *userData, FcStartDoctypeDecl (void *userData,
const XML_Char *doctypeName, const XML_Char *doctypeName,
const XML_Char *sysid, const XML_Char *sysid FC_UNUSED,
const XML_Char *pubid, const XML_Char *pubid FC_UNUSED,
int has_internal_subset) int has_internal_subset FC_UNUSED)
{ {
FcConfigParse *parse = userData; FcConfigParse *parse = userData;
@ -2766,7 +2766,7 @@ FcExternalSubsetDecl (void *userData,
#else /* ENABLE_LIBXML2 */ #else /* ENABLE_LIBXML2 */
static void static void
FcEndDoctypeDecl (void *userData) FcEndDoctypeDecl (void *userData FC_UNUSED)
{ {
} }