From 04f171d0cb04a900c0fa2398931dc6291840e101 Mon Sep 17 00:00:00 2001 From: Jordan Henderson Date: Fri, 17 May 2019 10:48:04 -0500 Subject: Avoid clearing error stack when calling H5Eget_msg() --- src/H5E.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5E.c b/src/H5E.c index 52b7cb7..07eaf18 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -866,7 +866,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size) H5E_msg_t *msg; /* Pointer to error message */ ssize_t ret_value = -1; /* Return value */ - FUNC_ENTER_API((-1)) + FUNC_ENTER_API_NOCLEAR((-1)) H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size); /* Get the message object */ -- cgit v0.12 From 802b2927254b1de163589b1e4eaced47ee81ad07 Mon Sep 17 00:00:00 2001 From: Jordan Henderson Date: Fri, 17 May 2019 10:49:27 -0500 Subject: Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack --- src/H5Eint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5Eint.c b/src/H5Eint.c index 7818879..e76db82 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -883,11 +883,11 @@ H5E__clear_entries(H5E_t *estack, size_t nentries) /* Release strings */ if(error->func_name) - H5MM_xfree((void *)error->func_name); /* Casting away const OK - QAK */ + error->func_name = (const char *) H5MM_xfree((void *)error->func_name); /* Casting away const OK - QAK */ if(error->file_name) - H5MM_xfree((void *)error->file_name); /* Casting away const OK - QAK */ + error->file_name = (const char *) H5MM_xfree((void *)error->file_name); /* Casting away const OK - QAK */ if(error->desc) - H5MM_xfree((void *)error->desc); /* Casting away const OK - QAK */ + error->desc = (const char *) H5MM_xfree((void *)error->desc); /* Casting away const OK - QAK */ } /* end for */ /* Decrement number of errors on stack */ -- cgit v0.12