diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-02 08:56:00 -0800 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:24 +0200 |
| commit | 563318af91403e1bd732141715e77c8caf6108f7 (patch) | |
| tree | 7add1687d16e05899304a06393b540fc5e2e7383 /nx-X11/lib/X11/Xrm.c | |
| parent | 20470a83e3a57f936cd90856325b897fa115b9ad (diff) | |
| download | nx-libs-563318af91403e1bd732141715e77c8caf6108f7.tar.gz nx-libs-563318af91403e1bd732141715e77c8caf6108f7.tar.bz2 nx-libs-563318af91403e1bd732141715e77c8caf6108f7.zip | |
Expand GetSizeOfFile() macro at the one place it's called
Removes XrmI.h header that only contained this single macro
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/Xrm.c')
| -rw-r--r-- | nx-X11/lib/X11/Xrm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index 2900816c1..4a47d2d0c 100644 --- a/nx-X11/lib/X11/Xrm.c +++ b/nx-X11/lib/X11/Xrm.c @@ -60,8 +60,8 @@ from The Open Group. #ifdef XTHREADS #include "locking.h" #endif -#include "XrmI.h" #include <nx-X11/Xos.h> +#include <sys/stat.h> #include "Xresinternal.h" #include "Xresource.h" @@ -1597,7 +1597,13 @@ ReadInFile(_Xconst char *filename) * result that the number of bytes actually read with be <= * to the size returned by fstat. */ - GetSizeOfFile(fd, size); + { + struct stat status_buffer; + if ( (fstat(fd, &status_buffer)) == -1 ) + size = -1; + else + size = status_buffer.st_size; + } /* There might have been a problem trying to stat a file */ if (size == -1) { |