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/Xrm.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/Xrm.c')
| -rw-r--r-- | nx-X11/lib/X11/Xrm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index 6adbc0dda..e83b28428 100644 --- a/nx-X11/lib/X11/Xrm.c +++ b/nx-X11/lib/X11/Xrm.c @@ -1595,13 +1595,13 @@ ReadInFile(_Xconst char *filename) * to the size returned by fstat. */ { - struct stat status_buffer; - if ( ((fstat(fd, &status_buffer)) == -1 ) || + struct stat status_buffer; + if ( ((fstat(fd, &status_buffer)) == -1 ) || (status_buffer.st_size >= INT_MAX) ) { - close (fd); - return (char *)NULL; - } else - size = (int) status_buffer.st_size; + close (fd); + return (char *)NULL; + } else + size = (int) status_buffer.st_size; } if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */ |