diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-17 14:24:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-17 14:24:36 (GMT) |
| commit | f2760f6117c1abe3217d21794501ada228432284 (patch) | |
| tree | aaff22404c6920bb55990e3d2440fd032c3f63a4 /src | |
| parent | 70284ba85e9cdcb4793831328020453af8310959 (diff) | |
| parent | 046e6e8770212dc020279aba1d7a5c9aa5ec5913 (diff) | |
| download | hdf5-f2760f6117c1abe3217d21794501ada228432284.zip hdf5-f2760f6117c1abe3217d21794501ada228432284.tar.gz hdf5-f2760f6117c1abe3217d21794501ada228432284.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '046e6e8770212dc020279aba1d7a5c9aa5ec5913':
Added a release note for HDFFV-10892 (fcntl lock bug).
Fix segfault after H5VL_loc_params_t fix merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Gdeprec.c | 4 | ||||
| -rw-r--r-- | src/H5VLpassthru.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 5acb378..97a3ccf 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -357,7 +357,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new tmp_vol_obj.connector = vol_obj->connector; /* Create the link through the VOL */ - if(H5VL_link_create(H5VL_LINK_CREATE_HARD, &tmp_vol_obj, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj->data, loc_params1) < 0) + if(H5VL_link_create(H5VL_LINK_CREATE_HARD, &tmp_vol_obj, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj->data, &loc_params1) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { @@ -437,7 +437,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier") /* Create the link through the VOL */ - if(H5VL_link_create(H5VL_LINK_CREATE_HARD, vol_obj2, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj1->data, loc_params1) < 0) + if(H5VL_link_create(H5VL_LINK_CREATE_HARD, vol_obj2, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj1->data, &loc_params1) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index eecdac2..24070fa 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -2131,11 +2131,11 @@ H5VL_pass_through_link_create(H5VL_link_create_type_t create_type, void *obj, /* Fix up the link target object for hard link creation */ if(H5VL_LINK_CREATE_HARD == create_type) { void *cur_obj; - H5VL_loc_params_t cur_params; + H5VL_loc_params_t *cur_params; /* Retrieve the object & loc params for the link target */ cur_obj = va_arg(arguments, void *); - cur_params = va_arg(arguments, H5VL_loc_params_t); + cur_params = va_arg(arguments, H5VL_loc_params_t *); /* If it's a non-NULL pointer, find the 'under object' and re-set the property */ if(cur_obj) { |