diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:56:57 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:56:57 (GMT) |
commit | ab2ff6eda496173e038d97685f96dd2de9e3df29 (patch) | |
tree | 14c6e9b0f608eacfb3a6e22ea73cc4effcf34968 /src/H5Dscatgath.c | |
parent | 416af901799f3ab85b1578696ece3c319877add1 (diff) | |
download | hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.zip hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.gz hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.bz2 |
[svn-r16280] Description:
Bring revision 16278 back from revise_chunks branch:
Update layout information in DCPL to unify all information in one
underlying property and switch to using H5O_layout_t for storing it, which
simplifies things considerably.
Also, fix many compiler warnings.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(Original patch tested on many machines)
Diffstat (limited to 'src/H5Dscatgath.c')
-rw-r--r-- | src/H5Dscatgath.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 867303f..bb9f46b 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -160,9 +160,9 @@ H5D_scatter_file(const H5D_io_info_t *_io_info, done: /* Release resources, if allocated */ if(len && len != _len) - H5FL_SEQ_FREE(size_t, len); + len = H5FL_SEQ_FREE(size_t, len); if(off && off != _off) - H5FL_SEQ_FREE(hsize_t, off); + off = H5FL_SEQ_FREE(hsize_t, off); FUNC_LEAVE_NOAPI(ret_value) } /* H5D_scatter_file() */ @@ -261,9 +261,9 @@ H5D_gather_file(const H5D_io_info_t *_io_info, done: /* Release resources, if allocated */ if(len && len != _len) - H5FL_SEQ_FREE(size_t, len); + len = H5FL_SEQ_FREE(size_t, len); if(off && off != _off) - H5FL_SEQ_FREE(hsize_t, off); + off = H5FL_SEQ_FREE(hsize_t, off); FUNC_LEAVE_NOAPI(ret_value) } /* H5D_gather_file() */ @@ -346,9 +346,9 @@ H5D_scatter_mem (const void *_tscat_buf, const H5S_t *space, done: /* Release resources, if allocated */ if(len && len != _len) - H5FL_SEQ_FREE(size_t, len); + len = H5FL_SEQ_FREE(size_t, len); if(off && off != _off) - H5FL_SEQ_FREE(hsize_t, off); + off = H5FL_SEQ_FREE(hsize_t, off); FUNC_LEAVE_NOAPI(ret_value) } /* H5D_scatter_mem() */ @@ -433,9 +433,9 @@ H5D_gather_mem(const void *_buf, const H5S_t *space, done: /* Release resources, if allocated */ if(len && len != _len) - H5FL_SEQ_FREE(size_t, len); + len = H5FL_SEQ_FREE(size_t, len); if(off && off != _off) - H5FL_SEQ_FREE(hsize_t, off); + off = H5FL_SEQ_FREE(hsize_t, off); FUNC_LEAVE_NOAPI(ret_value) } /* H5D_gather_mem() */ @@ -826,9 +826,9 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space, done: /* Release resources, if allocated */ if(len && len != _len) - H5FL_SEQ_FREE(size_t, len); + len = H5FL_SEQ_FREE(size_t, len); if(off && off != _off) - H5FL_SEQ_FREE(hsize_t, off); + off = H5FL_SEQ_FREE(hsize_t, off); FUNC_LEAVE_NOAPI(ret_value) } /* end H5D_compound_opt_read() */ |