diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 01:05:48 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 01:22:45 (GMT) |
| commit | 54d149061f36eaadf5308839a3627f9158d24458 (patch) | |
| tree | 03a411c3634a7f0a4415dacc81f61c58462f1bb4 /src/H5VLcallback.c | |
| parent | 35062073449be67956c3df0a4c6f56cad05e63bf (diff) | |
| download | hdf5-54d149061f36eaadf5308839a3627f9158d24458.zip hdf5-54d149061f36eaadf5308839a3627f9158d24458.tar.gz hdf5-54d149061f36eaadf5308839a3627f9158d24458.tar.bz2 | |
Unify code between H5Lcopy and H5Lmove
Diffstat (limited to 'src/H5VLcallback.c')
| -rw-r--r-- | src/H5VLcallback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c index 5400356..e486fde 100644 --- a/src/H5VLcallback.c +++ b/src/H5VLcallback.c @@ -4190,7 +4190,7 @@ H5VL_link_copy(const H5VL_object_t *src_vol_obj, const H5VL_loc_params_t *loc_pa vol_wrapper_set = TRUE; /* Call the corresponding internal VOL routine */ - if(H5VL__link_copy((src_vol_obj->data ? src_vol_obj->data : NULL), loc_params1, (dst_vol_obj ? dst_vol_obj->data : NULL), loc_params2, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req) < 0) + if(H5VL__link_copy(src_vol_obj->data, loc_params1, (dst_vol_obj ? dst_vol_obj->data : NULL), loc_params2, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTCOPY, FAIL, "link copy failed") done: @@ -4293,13 +4293,13 @@ H5VL_link_move(const H5VL_object_t *src_vol_obj, const H5VL_loc_params_t *loc_pa FUNC_ENTER_NOAPI(FAIL) /* Set wrapper info in API context */ - vol_obj = (src_vol_obj ? src_vol_obj : dst_vol_obj); + vol_obj = (src_vol_obj->data ? src_vol_obj : dst_vol_obj); if(H5VL_set_vol_wrapper(vol_obj->data, vol_obj->connector) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTSET, FAIL, "can't set VOL wrapper info") vol_wrapper_set = TRUE; /* Call the corresponding internal VOL routine */ - if(H5VL__link_move((src_vol_obj ? src_vol_obj->data : NULL), loc_params1, (dst_vol_obj ? dst_vol_obj->data : NULL), loc_params2, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req) < 0) + if(H5VL__link_move(src_vol_obj->data, loc_params1, (dst_vol_obj ? dst_vol_obj->data : NULL), loc_params2, vol_obj->connector->cls, lcpl_id, lapl_id, dxpl_id, req) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTMOVE, FAIL, "link move failed") done: |