diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2014-03-17 18:51:20 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2014-03-17 18:51:20 (GMT) |
| commit | 570271da6ab1504bb9b86e8fbb6d839277ec3aa8 (patch) | |
| tree | 8e37ee0905dc8bac61d803b431de003410d938bf | |
| parent | ad72021fd1b22c0e83053a30b3fcd66c40e29a84 (diff) | |
| download | hdf5-570271da6ab1504bb9b86e8fbb6d839277ec3aa8.zip hdf5-570271da6ab1504bb9b86e8fbb6d839277ec3aa8.tar.gz hdf5-570271da6ab1504bb9b86e8fbb6d839277ec3aa8.tar.bz2 | |
[svn-r24814] Fixes for tr_id/rcxt_id in xapl/xcpl/xxpl properties
| -rw-r--r-- | src/H5Pxapl.c | 12 | ||||
| -rw-r--r-- | src/H5Pxcpl.c | 12 | ||||
| -rw-r--r-- | src/H5Pxxpl.c | 13 |
3 files changed, 36 insertions, 1 deletions
diff --git a/src/H5Pxapl.c b/src/H5Pxapl.c index 237160e..4551ad6 100644 --- a/src/H5Pxapl.c +++ b/src/H5Pxapl.c @@ -36,6 +36,7 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5Sprivate.h" /* Dataspaces */ +#include "H5FFprivate.h" /* Fast Forward routines*/ #include "H5Xprivate.h" /* Index */ #include "H5Ppkg.h" /* Property lists */ @@ -106,10 +107,21 @@ const H5P_libclass_t H5P_CLS_XACC[1] = {{ static herr_t H5P__xacc_reg_prop(H5P_genclass_t *pclass) { + hid_t trans_id = FAIL; + hid_t context_id = FAIL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) + /* Register the transaction ID property*/ + if(H5P_register_real(pclass, H5VL_TRANS_ID, sizeof(hid_t), &trans_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") + + /* Register the context ID property*/ + if(H5P_register_real(pclass, H5VL_CONTEXT_ID, sizeof(hid_t), &context_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5P__xacc_reg_prop() */ diff --git a/src/H5Pxcpl.c b/src/H5Pxcpl.c index 1a28c2c..6b1d9bb 100644 --- a/src/H5Pxcpl.c +++ b/src/H5Pxcpl.c @@ -36,6 +36,7 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5Sprivate.h" /* Dataspaces */ +#include "H5FFprivate.h" /* Fast Forward routines*/ #include "H5Xprivate.h" /* Index */ #include "H5Ppkg.h" /* Property lists */ @@ -106,10 +107,21 @@ const H5P_libclass_t H5P_CLS_XCRT[1] = {{ static herr_t H5P__xcrt_reg_prop(H5P_genclass_t *pclass) { + hid_t trans_id = FAIL; + hid_t context_id = FAIL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) + /* Register the transaction ID property*/ + if(H5P_register_real(pclass, H5VL_TRANS_ID, sizeof(hid_t), &trans_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") + + /* Register the context ID property*/ + if(H5P_register_real(pclass, H5VL_CONTEXT_ID, sizeof(hid_t), &context_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5P__xcrt_reg_prop() */ diff --git a/src/H5Pxxpl.c b/src/H5Pxxpl.c index e2172ff..496bd24 100644 --- a/src/H5Pxxpl.c +++ b/src/H5Pxxpl.c @@ -36,6 +36,7 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5Sprivate.h" /* Dataspaces */ +#include "H5FFprivate.h" /* Fast Forward routines*/ #include "H5Xprivate.h" /* Index */ #include "H5Ppkg.h" /* Property lists */ @@ -92,7 +93,6 @@ const H5P_libclass_t H5P_CLS_XXFR[1] = {{ /* Local Variables */ /*******************/ - /*------------------------------------------------------------------------- * Function: H5P__xxfr_reg_prop * @@ -105,10 +105,21 @@ const H5P_libclass_t H5P_CLS_XXFR[1] = {{ static herr_t H5P__xxfr_reg_prop(H5P_genclass_t *pclass) { + hid_t trans_id = FAIL; + hid_t context_id = FAIL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) + /* Register the transaction ID property*/ + if(H5P_register_real(pclass, H5VL_TRANS_ID, sizeof(hid_t), &trans_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") + + /* Register the context ID property*/ + if(H5P_register_real(pclass, H5VL_CONTEXT_ID, sizeof(hid_t), &context_id, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5P__xxfr_reg_prop() */ |