diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
| commit | d517c77bc0fe9c9dbfd013d720e1533289decd9f (patch) | |
| tree | 97f369888eccbb8455ebbc2fd6de9f6834f6b433 /src/H5Dfill.c | |
| parent | fc7993a9f068319ed35f13fd153feeb5da3d86a7 (diff) | |
| download | hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.zip hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.gz hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.bz2 | |
[svn-r15610] Description:
Bring r15609 back from trunk:
Omnibus compiler warning cleanup & some formatting happiness.
Tested on:
Mac OS X/32 10.5.4 (amazon)
Too minor to require h5committest
Diffstat (limited to 'src/H5Dfill.c')
| -rw-r--r-- | src/H5Dfill.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Dfill.c b/src/H5Dfill.c index 6bc635e..22b3146 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -123,11 +123,11 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_ /* Check args */ if(buf == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer") - if(NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE))) + if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a dataspace") - if(NULL == (fill_type = H5I_object_verify(fill_type_id, H5I_DATATYPE))) + if(NULL == (fill_type = (H5T_t *)H5I_object_verify(fill_type_id, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype") - if(NULL == (buf_type = H5I_object_verify(buf_type_id, H5I_DATATYPE))) + if(NULL == (buf_type = (H5T_t *)H5I_object_verify(buf_type_id, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype") /* Fill the selection in the memory buffer */ @@ -320,10 +320,10 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "data type conversion failed") /* Point at element buffer */ - fill_buf = elem_ptr; + fill_buf = (const uint8_t *)elem_ptr; } /* end if */ else - fill_buf = fill; + fill_buf = (const uint8_t *)fill; /* Fill the selection in the memory buffer */ if(H5S_select_fill(fill_buf, dst_type_size, space, buf) < 0) @@ -401,7 +401,7 @@ H5D_fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, if(fb_info->has_vlen_fill_type) { /* Create temporary datatype for conversion operation */ if(NULL == (fb_info->mem_type = H5T_copy(dset_type, H5T_COPY_REOPEN))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCOPY, FAIL, "unable to copy file datatype") + HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy file datatype") if((fb_info->mem_tid = H5I_register(H5I_DATATYPE, fb_info->mem_type, FALSE)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register memory datatype") |