diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-25 14:13:50 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-25 14:13:50 (GMT) |
commit | 532a8df687e6acff18453fec6b8fe22f4bc65ebe (patch) | |
tree | 3d7904fedbbf204fd7aa49eabe598e672de43f99 /src/H5Ofill.c | |
parent | ed6cfe8ee6c09ac38cd6905a79cc9a5d36e779cd (diff) | |
parent | 8e3b094bad1706b444554cd23591fd1c4431c1f1 (diff) | |
download | hdf5-532a8df687e6acff18453fec6b8fe22f4bc65ebe.zip hdf5-532a8df687e6acff18453fec6b8fe22f4bc65ebe.tar.gz hdf5-532a8df687e6acff18453fec6b8fe22f4bc65ebe.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '8e3b094bad1706b444554cd23591fd1c4431c1f1':
Remainder of vol_normalization changes (dataset, attribute, files, objects).
Diffstat (limited to 'src/H5Ofill.c')
-rw-r--r-- | src/H5Ofill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 8a6004d..c131c76 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -754,8 +754,8 @@ H5O_fill_reset_dyn(H5O_fill_t *fill) } /* end if */ fill->size = 0; if(fill->type) { - (void)H5T_close_real(fill->type); - fill->type = NULL; + (void)H5T_close_real(fill->type); + fill->type = NULL; } /* end if */ done: @@ -1008,7 +1008,7 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed) * Can we convert between source and destination data types? */ if(NULL == (tpath = H5T_path_find(fill->type, dset_type))) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes") + HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to convert between src and dst datatypes") /* Don't bother doing anything if there will be no actual conversion */ if(!H5T_path_noop(tpath)) { |