diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-29 00:44:38 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:29 +0200 |
| commit | 687d44b6eaa3c64a12af9bbd557b401419b208eb (patch) | |
| tree | 55c30ba6b0ae6a2618395fae92922ea4402d52f6 /nx-X11/lib/X11/FontInfo.c | |
| parent | ea24f0b0eb7b82ad879810c8e84292d6bf810bea (diff) | |
| download | nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.gz nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.bz2 nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.zip | |
update src files *[ch] to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/FontInfo.c')
| -rw-r--r-- | nx-X11/lib/X11/FontInfo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/FontInfo.c b/nx-X11/lib/X11/FontInfo.c index c46d34ec1..368beebe4 100644 --- a/nx-X11/lib/X11/FontInfo.c +++ b/nx-X11/lib/X11/FontInfo.c @@ -44,7 +44,7 @@ _Xconst char *pattern, /* null-terminated */ int maxNames, int *actualCount, /* RETURN */ XFontStruct **info) /* RETURN */ -{ +{ register long nbytes; register int i; register XFontStruct *fs; @@ -65,7 +65,7 @@ XFontStruct **info) /* RETURN */ for (i = 0; ; i++) { if (!_XReply (dpy, (xReply *) &reply, - ((SIZEOF(xListFontsWithInfoReply) - + ((SIZEOF(xListFontsWithInfoReply) - SIZEOF(xGenericReply)) >> 2), xFalse)) { for (j=(i-1); (j >= 0); j--) { Xfree(flist[j]); @@ -83,7 +83,7 @@ XFontStruct **info) /* RETURN */ size = i + reply.nReplies + 1; if (finfo) { - XFontStruct * tmp_finfo = (XFontStruct *) + XFontStruct * tmp_finfo = (XFontStruct *) Xrealloc ((char *) finfo, (unsigned) (sizeof(XFontStruct) * size)); char ** tmp_flist = (char **) @@ -131,7 +131,7 @@ XFontStruct **info) /* RETURN */ fs->all_chars_exist = reply.allCharsExist; fs->ascent = cvtINT16toInt (reply.fontAscent); fs->descent = cvtINT16toInt (reply.fontDescent); - + /* XXX the next two statements won't work if short isn't 16 bits */ fs->min_bounds = * (XCharStruct *) &reply.minBounds; fs->max_bounds = * (XCharStruct *) &reply.maxBounds; @@ -201,10 +201,10 @@ XFontStruct **info) /* RETURN */ } int -XFreeFontInfo (names, info, actualCount) -char **names; -XFontStruct *info; -int actualCount; +XFreeFontInfo ( + char **names, + XFontStruct *info, + int actualCount) { register int i; if (names) { |