summaryrefslogtreecommitdiffstats
path: root/src/H5Dselect.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:27:15 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:27:15 (GMT)
commit634c7c5a93abb49a56336eec9e842a0bd694f828 (patch)
treed30f170a49ca3186bc8beddac7bf3523dfdb1ad3 /src/H5Dselect.c
parent9b1f93283c32f81658cf40d0caeb5333c4db6ae9 (diff)
downloadhdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.zip
hdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.tar.gz
hdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.tar.bz2
[svn-r16279] 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.c14
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() */