aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-02-02 08:56:00 -0800
committerUlrich Sibiller <uli42@gmx.de>2016-10-19 21:40:24 +0200
commit563318af91403e1bd732141715e77c8caf6108f7 (patch)
tree7add1687d16e05899304a06393b540fc5e2e7383 /nx-X11/lib
parent20470a83e3a57f936cd90856325b897fa115b9ad (diff)
downloadnx-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')
-rw-r--r--nx-X11/lib/X11/Xrm.c10
-rw-r--r--nx-X11/lib/X11/XrmI.h48
2 files changed, 8 insertions, 50 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) {
diff --git a/nx-X11/lib/X11/XrmI.h b/nx-X11/lib/X11/XrmI.h
deleted file mode 100644
index 63ed257ed..000000000
--- a/nx-X11/lib/X11/XrmI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-
-Copyright 1990, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-/*
- * Macros to abstract out reading the file, and getting its size.
- *
- * You may need to redefine these for various other operating systems.
- */
-
-#include <nx-X11/Xos.h>
-#include <sys/stat.h>
-#include <limits.h>
-
-#define GetSizeOfFile(fd,size) \
-{ \
- struct stat status_buffer; \
- if ( ((fstat((fd), &status_buffer)) == -1 ) || \
- (status_buffer.st_size >= INT_MAX) ) \
- size = -1; \
- else \
- size = status_buffer.st_size; \
-}