diff options
| author | Patrick Lam <plam@MIT.EDU> | 2005-09-22 23:45:53 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2005-09-22 23:45:53 +0000 |
| commit | 67accef4d3e245c1dea341e633d82b14aa03432a (patch) | |
| tree | 3362ec7cd9a9ce3229bfab083fbb8b33a548b872 /src/fcdefault.c | |
| parent | 141432505aecb158285ccc84ec5d7099e3c2efa7 (diff) | |
| download | fontconfig-67accef4d3e245c1dea341e633d82b14aa03432a.tar.gz | |
Fix more gcc4 warnings:
- Cast sizeof to int, to shut up signedness warnings in comparison.
- Add consts where appropriate.
reviewed by: Patrick Lam <plam@mit.edu>
Diffstat (limited to 'src/fcdefault.c')
| -rw-r--r-- | src/fcdefault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fcdefault.c b/src/fcdefault.c index 0e84311..5e648dc 100644 --- a/src/fcdefault.c +++ b/src/fcdefault.c @@ -26,7 +26,7 @@ #include <locale.h> static struct { - char *field; + const char *field; FcBool value; } FcBoolDefaults[] = { { FC_HINTING, FcTrue }, /* !FT_LOAD_NO_HINTING */ @@ -35,7 +35,7 @@ static struct { { FC_GLOBAL_ADVANCE, FcTrue }, /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */ }; -#define NUM_FC_BOOL_DEFAULTS (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0]) +#define NUM_FC_BOOL_DEFAULTS (int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0]) void FcDefaultSubstitute (FcPattern *pattern) @@ -127,7 +127,7 @@ FcDefaultSubstitute (FcPattern *pattern) after = territory + strlen (territory); } territory_len = after - territory; - if (lang_len + 1 + territory_len + 1 <= sizeof (lang_local)) + if (lang_len + 1 + territory_len + 1 <= (int) sizeof (lang_local)) { strncpy (lang_local, lang, lang_len); lang_local[lang_len] = '-'; |