diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-07 23:46:05 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:27 +0200 |
commit | e2e45b2b3abf46e4e5c27d7c655769f2b693446e (patch) | |
tree | 265fd610e8f45563804c32228df9ebafe3076c96 /nx-X11/lib/X11/Font.c | |
parent | 878040bf0bdb5d791cbe2ac6e07899c149517a79 (diff) | |
download | nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.tar.gz nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.tar.bz2 nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.zip |
Align files with upstream libX11-1.6.0
This commit looks a bit crazy at first glance. It (re-)introduces lots
of whitespaces and bad formatting.
Explanation: Backporting upstream changes lead to commits being
applied out of order. This meant a lot of manual intervention which in
turn lead to slight differences between upstream and NX.
With this commit these slight differences are minimized which will be
of great help when adding further upstream patches.
Diffstat (limited to 'nx-X11/lib/X11/Font.c')
-rw-r--r-- | nx-X11/lib/X11/Font.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c index 298d96c63..d48b7d0ff 100644 --- a/nx-X11/lib/X11/Font.c +++ b/nx-X11/lib/X11/Font.c @@ -260,7 +260,6 @@ _XQueryFont ( * If no characters in font, then it is a bad font, but * shouldn't try to read nothing. */ - /* have to unpack charinfos on some machines (CRAY) */ fs->per_char = NULL; if (reply.nCharInfos > 0){ /* nCharInfos is a CARD32 */ @@ -507,11 +506,11 @@ _XF86BigfontQueryFont ( /* compares each part to half the maximum, which should be far more than any real font needs, so the combined total doesn't overflow either */ if (reply.nUniqCharInfos > ((ULONG_MAX / 2) / SIZEOF(xCharInfo)) || - reply.nCharInfos > ((ULONG_MAX / 2) / sizeof(CARD16))) { - Xfree((char *) fs->properties); - Xfree((char *) fs); - _XEatDataWords(dpy, reply_left); - return (XFontStruct *)NULL; + reply.nCharInfos > ((ULONG_MAX / 2) / sizeof(CARD16))) { + Xfree((char *) fs->properties); + Xfree((char *) fs); + _XEatDataWords(dpy, reply_left); + return (XFontStruct *)NULL; } #endif if (reply.nCharInfos > 0) { |