From 03d438979b7bc6a08d25d121676bbd2083254c80 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 29 Sep 1999 21:49:44 -0500 Subject: [svn-r1696] Closed file handle leak for some failure cases. --- src/H5F.c | 2 +- src/H5private.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/H5F.c b/src/H5F.c index 508047b..8df9104 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -994,6 +994,7 @@ H5F_open(const char *name, uintn flags, hid_t fcpl_id, hid_t fapl_id) * exists), or if the new request adds write access (since the * readers don't expect the file to change under them). */ + H5FD_close(lf); if (flags & H5F_ACC_TRUNC) { file = NULL; /*to prevent destruction of wrong file*/ HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, @@ -1009,7 +1010,6 @@ H5F_open(const char *name, uintn flags, hid_t fcpl_id, hid_t fapl_id) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "file is already open for read-only"); } - H5FD_close(lf); file = H5F_new(file->shared, fcpl_id, fapl_id); lf = file->shared->lf; } else if (flags!=tent_flags) { diff --git a/src/H5private.h b/src/H5private.h index c2eecd4..d5985cb 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -379,10 +379,11 @@ typedef double float32; # error "nothing appropriate for float32" #endif -#if SIZEOF_FLOAT>=8 -typedef float float64; -#elif SIZEOF_DOUBLE>=8 +/* Bias float64 toward using double - QAK */ +#if SIZEOF_DOUBLE>=8 typedef double float64; +#elif SIZEOF_FLOAT>=8 +typedef float float64; #else # error "nothing appropriate for float64" #endif -- cgit v0.12