diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 13:45:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 13:45:56 +0000 |
| commit | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (patch) | |
| tree | 351df3c4d5648356980bc078544e25820e4d26fc /libXfont/src/bitmap/bdfutils.c | |
| parent | a7be905cf4423239285228d4e23caf2172adfa8b (diff) | |
| download | vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.tar.gz vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.tar.bz2 vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.zip | |
Added libXfont-1.4.0.tar.gz.
Diffstat (limited to 'libXfont/src/bitmap/bdfutils.c')
| -rw-r--r-- | libXfont/src/bitmap/bdfutils.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libXfont/src/bitmap/bdfutils.c b/libXfont/src/bitmap/bdfutils.c index a0c5ae949..17596c323 100644 --- a/libXfont/src/bitmap/bdfutils.c +++ b/libXfont/src/bitmap/bdfutils.c @@ -55,11 +55,9 @@ from The Open Group. #include <config.h> #endif -#ifndef FONTMODULE #include <ctype.h> #include <stdio.h> #include <stdarg.h> -#endif #include <X11/fonts/fntfilst.h> #include <X11/fonts/fontstruct.h> @@ -176,7 +174,7 @@ bdfGetPropertyValue(char *s) } /* quoted string: strip outer quotes and undouble inner quotes */ s++; - pp = p = (char *) xalloc((unsigned) strlen(s) + 1); + pp = p = malloc((unsigned) strlen(s) + 1); if (pp == NULL) { bdfError("Couldn't allocate property value string (%d)\n", strlen(s) + 1); return None; @@ -186,7 +184,7 @@ bdfGetPropertyValue(char *s) if (*(s + 1) != '"') { *p++ = 0; atom = bdfForceMakeAtom(pp, NULL); - xfree(pp); + free(pp); return atom; } else { s++; @@ -194,7 +192,7 @@ bdfGetPropertyValue(char *s) } *p++ = *s++; } - xfree (pp); + free (pp); bdfError("unterminated quoted string property: %s\n", (pointer) orig_s); return None; } |