From ca53d64e4607feb63a6147a871b04c42a81fccce Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Fri, 27 May 2011 16:32:39 -0500 Subject: [PATCH] [svn-r20921] Issue 7579 - The overflowing ENUM values are inconsistent. I took out the error report for 2 H5Tclose calls in H5T_conv_enum because they would clear the error stack. Tested on jam - simple change. --- src/H5Tconv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/H5Tconv.c b/src/H5Tconv.c index a3fb856f00..05ce6e1c15 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -2944,11 +2944,12 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, /* Close the type IDs. Have to use public function here */ if(conv_overflow) { - if(H5Tclose(src_super_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "problem closing datatype") - - if(H5Tclose(dst_super_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "problem closing datatype") + /* Disable the error stack for these two public functions. Otherwise they would + * clear it */ + H5E_BEGIN_TRY { + H5Tclose(src_super_id); + H5Tclose(dst_super_id); + } H5E_END_TRY; HDfree(tmp_buf); }