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/H5Dselect.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/H5Dselect.c')
| -rw-r--r-- | src/H5Dselect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Dselect.c b/src/H5Dselect.c index 947c81e..6dade5c 100644 --- a/src/H5Dselect.c +++ b/src/H5Dselect.c @@ -160,7 +160,7 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size, } /* end else */ /* Decrement number of elements left to process */ - HDassert((tmp_file_len % elmt_size) == 0); + HDassert(((size_t)tmp_file_len % elmt_size) == 0); } /* end if */ else { size_t mem_nelem; /* Number of elements used in memory sequences */ @@ -218,8 +218,8 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size, } /* end else */ /* Decrement number of elements left to process */ - HDassert((tmp_file_len % elmt_size) == 0); - nelmts -= (tmp_file_len / elmt_size); + HDassert(((size_t)tmp_file_len % elmt_size) == 0); + nelmts -= ((size_t)tmp_file_len / elmt_size); } /* end while */ } /* end else */ @@ -236,13 +236,13 @@ done: /* Release vector arrays, if allocated */ if(file_len && file_len != _file_len) - H5FL_SEQ_FREE(size_t, file_len); + file_len = H5FL_SEQ_FREE(size_t, file_len); if(file_off && file_off != _file_off) - H5FL_SEQ_FREE(hsize_t, file_off); + file_off = H5FL_SEQ_FREE(hsize_t, file_off); if(mem_len && mem_len != _mem_len) - H5FL_SEQ_FREE(size_t, mem_len); + mem_len = H5FL_SEQ_FREE(size_t, mem_len); if(mem_off && mem_off != _mem_off) - H5FL_SEQ_FREE(hsize_t, mem_off); + mem_off = H5FL_SEQ_FREE(hsize_t, mem_off); FUNC_LEAVE_NOAPI(ret_value) } /* end H5D_select_io() */ |