From 26270ab1cf15520043b1d138916fce394780e279 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 2 Feb 2011 08:58:45 -0800 Subject: 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 Reviewed-by: Julien Cristau Backported-to-NX-by: Ulrich Sibiller --- nx-X11/lib/X11/Xrm.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'nx-X11/lib') diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index 4a47d2d0c..81fbfaf35 100644 --- 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; -- cgit v1.2.3