diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /libXfont/src/fontfile/fontdir.c | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXfont/src/fontfile/fontdir.c')
| -rw-r--r-- | libXfont/src/fontfile/fontdir.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libXfont/src/fontfile/fontdir.c b/libXfont/src/fontfile/fontdir.c index e052bb371..97b2ba3b1 100644 --- a/libXfont/src/fontfile/fontdir.c +++ b/libXfont/src/fontfile/fontdir.c @@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. Bool FontFileInitTable (FontTablePtr table, int size) { - if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec))) + if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec))) return FALSE; if (size) { @@ -102,12 +102,12 @@ FontFileFreeTable (FontTablePtr table) } FontDirectoryPtr -FontFileMakeDir(char *dirName, int size) +FontFileMakeDir(const char *dirName, int size) { FontDirectoryPtr dir; int dirlen; int needslash = 0; - char *attrib; + const char *attrib; int attriblen; #if !defined(WIN32) @@ -279,7 +279,7 @@ FontFileSortDir(FontDirectoryPtr dir) #define isDigit(c) (XK_0 <= (c) && (c) <= XK_9) static int -SetupWildMatch(FontTablePtr table, FontNamePtr pat, +SetupWildMatch(FontTablePtr table, FontNamePtr pat, int *leftp, int *rightp, int *privatep) { int nDashes; @@ -438,7 +438,7 @@ FontFileSaveString (char *s) } FontEntryPtr -FontFileFindNameInScalableDir(FontTablePtr table, FontNamePtr pat, +FontFileFindNameInScalableDir(FontTablePtr table, FontNamePtr pat, FontScalablePtr vals) { int i, @@ -491,7 +491,7 @@ FontFileFindNameInDir(FontTablePtr table, FontNamePtr pat) } int -FontFileFindNamesInScalableDir(FontTablePtr table, FontNamePtr pat, int max, +FontFileFindNamesInScalableDir(FontTablePtr table, FontNamePtr pat, int max, FontNamesPtr names, FontScalablePtr vals, int alias_behavior, int *newmax) { @@ -578,7 +578,7 @@ FontFileFindNamesInScalableDir(FontTablePtr table, FontNamePtr pat, int max, } int -FontFileFindNamesInDir(FontTablePtr table, FontNamePtr pat, +FontFileFindNamesInDir(FontTablePtr table, FontNamePtr pat, int max, FontNamesPtr names) { return FontFileFindNamesInScalableDir(table, pat, max, names, @@ -767,7 +767,7 @@ FontFileAddFontFile (FontDirectoryPtr dir, char *fontName, char *fileName) extra->defaults.y = 75; } } - else + else { extra->defaults.x = vals.x; extra->defaults.y = vals.y; |