diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-05-21 14:51:36 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-05-21 14:51:36 (GMT) |
| commit | f37a17a6cef650c7e304d687c4f9b0a948c4262e (patch) | |
| tree | 2e8b14ef4ab223d961f6d9e29e49ee93706d8300 /src | |
| parent | 2717a0da8ba21e31dde5c15fc2c186d79cbb0c90 (diff) | |
| parent | 802b2927254b1de163589b1e4eaced47ee81ad07 (diff) | |
| download | hdf5-f37a17a6cef650c7e304d687c4f9b0a948c4262e.zip hdf5-f37a17a6cef650c7e304d687c4f9b0a948c4262e.tar.gz hdf5-f37a17a6cef650c7e304d687c4f9b0a948c4262e.tar.bz2 | |
Merge pull request #1709 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '802b2927254b1de163589b1e4eaced47ee81ad07':
Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack
Avoid clearing error stack when calling H5Eget_msg()
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5E.c | 2 | ||||
| -rw-r--r-- | src/H5Eint.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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 */ 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 */ |