diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-05-30 07:38:48 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-05-30 07:38:48 (GMT) |
| commit | 6468a613fd14570a29bb54c0437bbc087f770621 (patch) | |
| tree | 4c9389c1d670f85a95371271f5411f14e375fdd6 /src/H5Dvirtual.c | |
| parent | a1a05d220a037a6f035cadd9316f0eaca88e300f (diff) | |
| download | hdf5-6468a613fd14570a29bb54c0437bbc087f770621.zip hdf5-6468a613fd14570a29bb54c0437bbc087f770621.tar.gz hdf5-6468a613fd14570a29bb54c0437bbc087f770621.tar.bz2 | |
Many normalizations with develop.
Diffstat (limited to 'src/H5Dvirtual.c')
| -rw-r--r-- | src/H5Dvirtual.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index d9396f3..f11b904 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -509,7 +509,7 @@ H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to serialize source selection") /* Virtual selection */ - if(H5S_SELECT_SERIALIZE(layout->storage.u.virt.list[i].source_dset.virtual_select, &heap_block_p) < 0) + if(H5S_SELECT_SERIALIZE(layout->storage.u.virt.list[i].source_dset.virtual_select, &heap_block_p) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to serialize virtual selection") } /* end for */ @@ -526,7 +526,6 @@ done: heap_block = (uint8_t *)H5MM_xfree(heap_block); str_size = (size_t *)H5MM_xfree(str_size); - FUNC_LEAVE_NOAPI(ret_value) } /* end H5D__virtual_store_layout() */ @@ -3016,8 +3015,8 @@ done: static herr_t H5D__virtual_refresh_source_dset(H5D_t **dset) { - hid_t dset_id; /* Temporary dataset identifier */ - herr_t ret_value = SUCCEED; /* Return value */ + hid_t temp_id = H5I_INVALID_HID; /* Temporary dataset identifier */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -3025,20 +3024,20 @@ H5D__virtual_refresh_source_dset(H5D_t **dset) HDassert(dset && *dset); /* Get a temporary identifier for this source dataset */ - if((dset_id = H5I_register(H5I_DATASET, *dset, FALSE)) < 0) + if((temp_id = H5I_register(H5I_DATASET, *dset, FALSE)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "can't register source dataset ID") /* Refresh source dataset */ - if(H5D__refresh(dset_id, *dset) < 0) + if(H5D__refresh(temp_id, *dset) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to refresh source dataset") /* Discard the identifier & replace the dataset */ - if(NULL == (*dset = (H5D_t *)H5I_remove(dset_id))) + if(NULL == (*dset = (H5D_t *)H5I_remove(temp_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "can't unregister source dataset ID") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5D__virtual_refresh_source_dsets() */ +} /* end H5D__virtual_refresh_source_dset() */ /*------------------------------------------------------------------------- |