summaryrefslogtreecommitdiffstats
path: root/src/H5Distore.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-06-19 16:06:55 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-06-19 16:06:55 (GMT)
commitea052ffd55cabca3ef756a7f44e7f3f2fa32b679 (patch)
treeb7c28b9fa9d1552d5a0bcfbaba686d925d5470a5 /src/H5Distore.c
parent29a0f3e3586080a69f0048bf79dec5e9749fcb5d (diff)
downloadhdf5-ea052ffd55cabca3ef756a7f44e7f3f2fa32b679.zip
hdf5-ea052ffd55cabca3ef756a7f44e7f3f2fa32b679.tar.gz
hdf5-ea052ffd55cabca3ef756a7f44e7f3f2fa32b679.tar.bz2
[svn-r5674] Purpose:
Code cleanup Description: Removed more compiler warnings, etc. Platforms tested: Linux 2.2.x (eirene) w/parallel
Diffstat (limited to 'src/H5Distore.c')
-rw-r--r--src/H5Distore.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 913bdf9..a44ce5a 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -2396,7 +2396,8 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
/* Check if fill values should be written to blocks */
if(fill_time != H5D_FILL_TIME_NEVER) {
/* Allocate chunk buffer for processes to use when writing fill values */
- if (NULL==(chunk = H5MM_malloc(chunk_size)))
+ H5_CHECK_OVERFLOW(chunk_size,hsize_t,size_t);
+ if (NULL==(chunk = H5MM_malloc((size_t)chunk_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for chunk");
/* Fill the chunk with the proper values */
@@ -2405,12 +2406,12 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
* Replicate the fill value throughout the chunk.
*/
assert(0==chunk_size % fill.size);
- H5V_array_fill(chunk, fill.buf, fill.size, chunk_size/fill.size);
+ H5V_array_fill(chunk, fill.buf, fill.size, (size_t)chunk_size/fill.size);
} else {
/*
* No fill value was specified, assume all zeros.
*/
- HDmemset (chunk, 0, chunk_size);
+ HDmemset (chunk, 0, (size_t)chunk_size);
} /* end else */
} /* end if */