Refactor link creation parameters from being passing as properties in the

link creation property list to vararg function parameters.

1 files changed, 26 insertions, 15 deletions

diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c
index 548667f..48ca3b1 100644
--- a/src/H5VLcallback.c
+++ b/src/H5VLcallback.c
@@ -123,7 +123,7 @@ static herr_t H5VL__group_close(void *obj, const H5VL_class_t *cls,
     hid_t dxpl_id, void **req);
 static herr_t H5VL__link_create(H5VL_link_create_type_t create_type, void *obj,
     const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, hid_t lcpl_id,
-    hid_t lapl_id, hid_t dxpl_id, void **req);
+    hid_t lapl_id, hid_t dxpl_id, void **req, va_list arguments);
 static herr_t H5VL__link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1,
     void *dst_obj, const H5VL_loc_params_t *loc_params2, const H5VL_class_t *cls,
     hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req);
@@ -4002,7 +4002,8 @@ done:
  */
 static herr_t
 H5VL__link_create(H5VL_link_create_type_t create_type, void *obj, const H5VL_loc_params_t *loc_params, 
-    const H5VL_class_t *cls, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req)
+    const H5VL_class_t *cls, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req,
+    va_list arguments)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -4013,7 +4014,7 @@ H5VL__link_create(H5VL_link_create_type_t create_type, void *obj, const H5VL_loc
         HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "VOL connector has no 'link create' method")
 
     /* Call the corresponding VOL callback */
-    if((cls->link_cls.create)(create_type, obj, loc_params, lcpl_id, lapl_id, dxpl_id, req) < 0)
+    if((cls->link_cls.create)(create_type, obj, loc_params, lcpl_id, lapl_id, dxpl_id, req, arguments) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "link create failed")
 
 done:
@@ -4034,23 +4035,28 @@ done:
 herr_t
 H5VL_link_create(H5VL_link_create_type_t create_type, const H5VL_object_t *vol_obj,
     const H5VL_loc_params_t *loc_params, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id,
-    void **req)
+    void **req, ...)
 {
     H5VL_object_t tmp_vol_obj;          /* Temporary object token of */
+    va_list arguments;                  /* Argument list passed from the API call */
+    hbool_t arg_started = FALSE;        /* Whether the va_list has been started */
     hbool_t vol_wrapper_set = FALSE;    /* Whether the VOL object wrapping context was set up */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
+    /* Start the varargs, so they can be copied */
+    HDva_start(arguments, req);
+    arg_started = TRUE;
+
     /* Special case for hard links */
     if(H5VL_LINK_CREATE_HARD == create_type && NULL == vol_obj->data) {
-        H5P_genplist_t *plist;              /* Property list pointer */
+        va_list tmp_arguments;  /* Copy of argument list passed in */
 
-        /* Get the VOL data pointer from the fapl */
-        if(NULL == (plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
-            HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, FAIL, "not a file access property list")
-        if(H5P_peek(plist, H5VL_PROP_LINK_TARGET, &tmp_vol_obj.data) < 0)
-            HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't get VOL connector info")
+        /* Get the VOL data pointer from the varargs */
+        HDva_copy(tmp_arguments, arguments);
+        tmp_vol_obj.data = HDva_arg(tmp_arguments, void *);
+        HDva_end(tmp_arguments);
     } /* end if */
     else
         /* Use the VOL object passed in */
@@ -4063,10 +4069,14 @@ H5VL_link_create(H5VL_link_create_type_t create_type, const H5VL_object_t *vol_o
     vol_wrapper_set = TRUE;
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__link_create(create_type, vol_obj->data, loc_params, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req) < 0)
+    if(H5VL__link_create(create_type, vol_obj->data, loc_params, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req, arguments) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "link create failed")
 
 done:
+    /* End access to the va_list, if we started it */
+    if(arg_started)
+        HDva_end(arguments);
+
     /* Reset object wrapping info in API context */
     if(vol_wrapper_set && H5VL_reset_vol_wrapper() < 0)
         HDONE_ERROR(H5E_VOL, H5E_CANTRESET, FAIL, "can't reset VOL wrapper info")
@@ -4089,21 +4099,22 @@ done:
  */
 herr_t
 H5VLlink_create(H5VL_link_create_type_t create_type, void *obj, const H5VL_loc_params_t *loc_params,
-    hid_t connector_id, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req)
+    hid_t connector_id, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id, void **req,
+    va_list arguments)
 {
     H5VL_class_t *cls;                  /* VOL connector's class struct */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API_NOINIT
-    H5TRACE8("e", "Vk*x*xiiii**x", create_type, obj, loc_params, connector_id,
-             lcpl_id, lapl_id, dxpl_id, req);
+    H5TRACE9("e", "Vk*x*xiiii**xx", create_type, obj, loc_params, connector_id,
+             lcpl_id, lapl_id, dxpl_id, req, arguments);
 
     /* Get class pointer */
     if(NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a VOL connector ID")
 
     /* Call the corresponding internal VOL routine */
-    if(H5VL__link_create(create_type, obj, loc_params, cls, lcpl_id, lapl_id, dxpl_id, req) < 0)
+    if(H5VL__link_create(create_type, obj, loc_params, cls, lcpl_id, lapl_id, dxpl_id, req, arguments) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "unable to create link")
 
 done: