diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-02 19:59:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-02 19:59:46 (GMT) |
| commit | 79aecf895393d2871764a9405c9698fd73225925 (patch) | |
| tree | e14ce866c67d4ef68916e8b79c2f3c35dc51c463 /src/H5Ofill.c | |
| parent | a36a5b30d79f037169fc5cf95a2a600ded674409 (diff) | |
| download | hdf5-79aecf895393d2871764a9405c9698fd73225925.zip hdf5-79aecf895393d2871764a9405c9698fd73225925.tar.gz hdf5-79aecf895393d2871764a9405c9698fd73225925.tar.bz2 | |
[svn-r12706] Description:
Clean up some of the warnings on 64-bit Linux...
Tested on:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago2)
Too minor to require h5committest
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 e7c5537..37841ad 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -860,15 +860,15 @@ H5O_fill_convert(void *_fill, H5T_t *dset_type, hid_t dxpl_id) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion"); HDmemcpy(buf, fill->buf, H5T_get_size(fill->type)); } - if (H5T_path_bkg(tpath) && NULL==(bkg=H5MM_malloc(H5T_get_size(dset_type)))) + if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(dset_type)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion"); /* Do the conversion */ - if (H5T_convert(tpath, src_id, dst_id, 1, 0, 0, buf, bkg, dxpl_id)<0) + if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg, dxpl_id) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed"); /* Update the fill message */ - if (buf!=fill->buf) { + if(buf != fill->buf) { H5MM_xfree(fill->buf); fill->buf = buf; } |