diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-07-09 15:29:34 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-07-09 15:29:34 (GMT) |
| commit | a1dd404892edceed2b1858dd9ea8db924866747f (patch) | |
| tree | c95ac0481b28d68927db7749ec44740ddc2e9443 /src/H5Dscatgath.c | |
| parent | 2e7e454537f6852c677180167f3d29df9263996f (diff) | |
| parent | 30c756decb6101704a925443d623301656ba60e4 (diff) | |
| download | hdf5-a1dd404892edceed2b1858dd9ea8db924866747f.zip hdf5-a1dd404892edceed2b1858dd9ea8db924866747f.tar.gz hdf5-a1dd404892edceed2b1858dd9ea8db924866747f.tar.bz2 | |
Merge pull request #2682 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_1_10 to hdf5_1_10
* commit '30c756decb6101704a925443d623301656ba60e4':
Misc normalizations with develop.
Added missing types to bin/trace after develop normalization.
More normalization with H5S from develop.
Continued normalization of H5S with develop.
Normalization of H5MM and H5FL with develop. Adds the new stats calls.
Further normalization of H5S with develop
Diffstat (limited to 'src/H5Dscatgath.c')
| -rw-r--r-- | src/H5Dscatgath.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 0d88812..0e0edf7 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -27,6 +27,7 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free Lists */ #include "H5Iprivate.h" /* IDs */ +#include "H5MMprivate.h" /* Memory management */ /****************/ @@ -559,11 +560,9 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf if(H5Z_xform_eval(data_transform, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0) HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "Error performing data transform") - } /* end if */ + } - /* - * Scatter the data into memory. - */ + /* Scatter the data into memory */ if(H5D__scatter_mem(type_info->tconv_buf, mem_space, mem_iter, smine_nelmts, buf/*out*/) < 0) HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "scatter failed") } /* end else */ @@ -691,9 +690,9 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in if(H5CX_get_data_transform(&data_transform) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get data transform info") - if(H5Z_xform_eval(data_transform, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "Error performing data transform") - } /* end if */ + if(H5Z_xform_eval(data_transform, type_info->tconv_buf, smine_nelmts, type_info->mem_type) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "Error performing data transform") + } /* * Perform datatype conversion. |