Xrm.c: ReadInFile: refactor fstat error handling

We can simplify the fstat failure case now that the GetFileSize macro has been expanded inline. 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>

Xrm.c: ReadInFile: refactor fstat error handling
26270ab1 · Alan Coopersmith · Ulrich Sibiller · 563318af · 26270ab1
Commit 26270ab1 authored Feb 02, 2011 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

Xrm.c nx-X11/lib/X11/Xrm.c +4 -9

No files found.
--- a/nx-X11/lib/X11/Xrm.c
+++ b/nx-X11/lib/X11/Xrm.c
@@ -1599,18 +1599,13 @@ ReadInFile(_Xconst char *filename)
     */
    {
       struct stat status_buffer;
-       if ( (fstat(fd, &status_buffer)) == -1 )
-           size = -1;
-       else
+       if ( (fstat(fd, &status_buffer)) == -1 ) {
+           close (fd);
+           return (char *)NULL;
+       } else
           size = status_buffer.st_size;
    }

-    /* There might have been a problem trying to stat a file */
-    if (size == -1) {
-	close (fd);
-	return (char *)NULL;
-    }
-
    if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
 	close(fd);
 	return (char *)NULL;