From 3967f2a9a09bb19d40cdbcf89e7543c531b5a16f Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 6 Aug 2024 06:21:35 -0500 Subject: [PATCH] Drop H5E_BEGIN/END_TRY and just check the error return from H5I_clear_types() (#4694) Original case that the change in commit 2dc738a321e45ce1e0c5edcc2bf7f3623e823c9e no longer applies. --- src/H5Iint.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/H5Iint.c b/src/H5Iint.c index fe3b90c2454..709b9450802 100644 --- a/src/H5Iint.c +++ b/src/H5Iint.c @@ -439,11 +439,8 @@ H5I__destroy_type(H5I_type_t type) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, FAIL, "invalid type"); /* Close/clear/destroy all IDs for this type */ - H5E_BEGIN_TRY - { - H5I_clear_type(type, true, false); - } - H5E_END_TRY /* don't care about errors */ + if (H5I_clear_type(type, true, false) < 0) + HGOTO_ERROR(H5E_ID, H5E_CANTRELEASE, FAIL, "unable to release IDs for type"); /* Check if we should release the ID class */ if (type_info->cls->flags & H5I_CLASS_IS_APPLICATION)