Revert "Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_12"

This reverts commit 9f9336a5bd541752f472bab4c93da8de89f862cd, reversing
changes made to 437a1919e7ba60fe75a33a466d264183a0255319.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c
index 77df207..3f24ce2 100644
--- a/src/H5VLcallback.c
+++ b/src/H5VLcallback.c
@@ -82,10 +82,10 @@ static void *H5VL__dataset_open(void *obj, const H5VL_loc_params_t *loc_params,
     const H5VL_class_t *cls, const char *name, hid_t dapl_id, hid_t dxpl_id,
     void **req);
 static herr_t H5VL__dataset_read(void *dset, const H5VL_class_t *cls,
-    hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
+    hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id,
     void *buf, void **req);
 static herr_t H5VL__dataset_write(void *obj, const H5VL_class_t *cls,
-    hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
+    hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id,
     const void *buf, void **req);
 static herr_t H5VL__dataset_get(void *obj, const H5VL_class_t *cls, H5VL_dataset_get_t get_type, 
     hid_t dxpl_id, void **req, va_list arguments);
@@ -2015,7 +2015,7 @@ done:
  */
 static herr_t 
 H5VL__dataset_read(void *obj, const H5VL_class_t *cls, hid_t mem_type_id,
-    hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf,
+    hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf,
     void **req)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -2027,7 +2027,7 @@ H5VL__dataset_read(void *obj, const H5VL_class_t *cls, hid_t mem_type_id,
         HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "VOL connector has no 'dataset read' method")
 
     /* Call the corresponding VOL callback */
-    if((cls->dataset_cls.read)(obj, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if((cls->dataset_cls.read)(obj, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_READERROR, FAIL, "dataset read failed")
 
 done:
@@ -2047,7 +2047,7 @@ done:
  */
 herr_t 
 H5VL_dataset_read(const H5VL_object_t *vol_obj, hid_t mem_type_id,
-    hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf,
+    hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf,
     void **req)
 {
     hbool_t vol_wrapper_set = FALSE;    /* Whether the VOL object wrapping context was set up */
@@ -2061,7 +2061,7 @@ H5VL_dataset_read(const H5VL_object_t *vol_obj, hid_t mem_type_id,
     vol_wrapper_set = TRUE;
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__dataset_read(vol_obj->data, vol_obj->connector->cls, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if(H5VL__dataset_read(vol_obj->data, vol_obj->connector->cls, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_READERROR, FAIL, "dataset read failed")
 
 done:
@@ -2085,14 +2085,14 @@ done:
  */
 herr_t
 H5VLdataset_read(void *obj, hid_t connector_id, hid_t mem_type_id, hid_t mem_space_id,
-    hid_t file_space_id, hid_t dxpl_id, void *buf, void **req)
+    hid_t file_space_id, hid_t plist_id, void *buf, void **req)
 {
     H5VL_class_t *cls;                  /* VOL connector's class struct */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API_NOINIT
     H5TRACE8("e", "*xiiiii*x**x", obj, connector_id, mem_type_id, mem_space_id,
-             file_space_id, dxpl_id, buf, req);
+             file_space_id, plist_id, buf, req);
 
     /* Check args and get class pointer */
     if(NULL == obj)
@@ -2101,7 +2101,7 @@ H5VLdataset_read(void *obj, hid_t connector_id, hid_t mem_type_id, hid_t mem_spa
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a VOL connector ID")
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__dataset_read(obj, cls, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if(H5VL__dataset_read(obj, cls, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "unable to read dataset")
 
 done:
@@ -2121,7 +2121,7 @@ done:
  */
 static herr_t 
 H5VL__dataset_write(void *obj, const H5VL_class_t *cls, hid_t mem_type_id,
-    hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf,
+    hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf,
     void **req)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -2133,7 +2133,7 @@ H5VL__dataset_write(void *obj, const H5VL_class_t *cls, hid_t mem_type_id,
         HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "VOL connector has no 'dataset write' method")
 
     /* Call the corresponding VOL callback */
-    if((cls->dataset_cls.write)(obj, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if((cls->dataset_cls.write)(obj, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_WRITEERROR, FAIL, "dataset write failed")
 
 done:
@@ -2153,7 +2153,7 @@ done:
  */
 herr_t 
 H5VL_dataset_write(const H5VL_object_t *vol_obj, hid_t mem_type_id,
-    hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf,
+    hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf,
     void **req)
 {
     hbool_t vol_wrapper_set = FALSE;    /* Whether the VOL object wrapping context was set up */
@@ -2167,7 +2167,7 @@ H5VL_dataset_write(const H5VL_object_t *vol_obj, hid_t mem_type_id,
     vol_wrapper_set = TRUE;
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__dataset_write(vol_obj->data, vol_obj->connector->cls, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if(H5VL__dataset_write(vol_obj->data, vol_obj->connector->cls, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_WRITEERROR, FAIL, "dataset write failed")
 
 done:
@@ -2191,14 +2191,14 @@ done:
  */
 herr_t
 H5VLdataset_write(void *obj, hid_t connector_id, hid_t mem_type_id, hid_t mem_space_id,
-    hid_t file_space_id, hid_t dxpl_id, const void *buf, void **req)
+    hid_t file_space_id, hid_t plist_id, const void *buf, void **req)
 {
     H5VL_class_t *cls;                  /* VOL connector's class struct */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API_NOINIT
     H5TRACE8("e", "*xiiiii*x**x", obj, connector_id, mem_type_id, mem_space_id,
-             file_space_id, dxpl_id, buf, req);
+             file_space_id, plist_id, buf, req);
 
     /* Check args and get class pointer */
     if(NULL == obj)
@@ -2207,7 +2207,7 @@ H5VLdataset_write(void *obj, hid_t connector_id, hid_t mem_type_id, hid_t mem_sp
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a VOL connector ID")
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__dataset_write(obj, cls, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, req) < 0)
+    if(H5VL__dataset_write(obj, cls, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "unable to write dataset")
 
 done: