diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 18:50:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 18:50:14 (GMT) |
commit | d96e6789c0be7046b1f191864efc02a2aeed645e (patch) | |
tree | fe0ce334a5c06be2d8fd448b1c5908637078d623 /src/H5E.c | |
parent | aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c (diff) | |
download | hdf5-d96e6789c0be7046b1f191864efc02a2aeed645e.zip hdf5-d96e6789c0be7046b1f191864efc02a2aeed645e.tar.gz hdf5-d96e6789c0be7046b1f191864efc02a2aeed645e.tar.bz2 |
[svn-r17277] Description:
Bring r17275 and r17276 from trunk to 1.8 branch.
Tested on:
Mac OS X/32 10.5.7 (amazon) w/debug & production
(too minor to require h5committest)
Diffstat (limited to 'src/H5E.c')
-rw-r--r-- | src/H5E.c | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -1273,7 +1273,6 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, { va_list ap; /* Varargs info */ H5E_t *estack; /* Pointer to error stack to modify */ - H5E_msg_t *maj_ptr, *min_ptr; /* Pointer to major and minor error info */ #ifndef H5_HAVE_VASPRINTF int tmp_len; /* Current size of description buffer */ int desc_len; /* Actual length of description when formatted */ @@ -1296,14 +1295,6 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error stack ID") } /* end else */ - /* Check for mis-matches in major & minor error classes */ - if(NULL == (maj_ptr = (H5E_msg_t *)H5I_object_verify(maj_id, H5I_ERROR_MSG))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error message ID") - if(NULL == (min_ptr = (H5E_msg_t *)H5I_object_verify(min_id, H5I_ERROR_MSG))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a error message ID") - if(maj_ptr->cls != min_ptr->cls) - HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "major and minor errors not from same error class") - /* Format the description */ va_start(ap, fmt); |