diff options
Diffstat (limited to 'libXfont/src/bitmap/bdfutils.c')
| -rw-r--r-- | libXfont/src/bitmap/bdfutils.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libXfont/src/bitmap/bdfutils.c b/libXfont/src/bitmap/bdfutils.c index 1d6cc7253..288148b36 100644 --- a/libXfont/src/bitmap/bdfutils.c +++ b/libXfont/src/bitmap/bdfutils.c @@ -68,7 +68,7 @@ int bdfFileLineNum; /***====================================================================***/ void -bdfError(char* message, ...) +bdfError(const char* message, ...) { va_list args; @@ -81,7 +81,7 @@ bdfError(char* message, ...) /***====================================================================***/ void -bdfWarning(char *message, ...) +bdfWarning(const char *message, ...) { va_list args; @@ -127,7 +127,7 @@ bdfGetLine(FontFilePtr file, unsigned char *buf, int len) /***====================================================================***/ Atom -bdfForceMakeAtom(char *str, int *size) +bdfForceMakeAtom(const char *str, int *size) { register int len = strlen(str); Atom the_atom; @@ -174,8 +174,9 @@ bdfGetPropertyValue(char *s) s++; pp = p = malloc((unsigned) strlen(s) + 1); if (pp == NULL) { - bdfError("Couldn't allocate property value string (%d)\n", strlen(s) + 1); - return None; + bdfError("Couldn't allocate property value string (%d)\n", + (int) strlen(s) + 1); + return None; } while (*s) { if (*s == '"') { @@ -191,7 +192,7 @@ bdfGetPropertyValue(char *s) *p++ = *s++; } free (pp); - bdfError("unterminated quoted string property: %s\n", (pointer) orig_s); + bdfError("unterminated quoted string property: %s\n", orig_s); return None; } @@ -249,7 +250,7 @@ bdfHexByte(unsigned char *s) * check for known special property values */ -static char *SpecialAtoms[] = { +static const char *SpecialAtoms[] = { "FONT_ASCENT", #define BDF_FONT_ASCENT 0 "FONT_DESCENT", @@ -276,11 +277,11 @@ static char *SpecialAtoms[] = { }; Bool -bdfSpecialProperty(FontPtr pFont, FontPropPtr prop, +bdfSpecialProperty(FontPtr pFont, FontPropPtr prop, char isString, bdfFileState *bdfState) { - char **special; - char *name; + const char **special; + const char *name; name = NameForAtom(prop->name); for (special = SpecialAtoms; *special; special++) |