mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22935] Description:

Browse Source 
Clean up a few warnings and minor code issues during review of enum ->
int/float conversion changes.

Tested on:
    Mac OSX/64 10.8.2 (amazon) w/debug
    (too minor to require h5committest)
This commit is contained in:
Quincey Koziol 2012-10-20 22:44:32 -05:00
parent 961a24ac3c
commit 8430e2d4de
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/H5Tconv.c
View File

@ -2909,8 +2909,8 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
size_t buf_stride, size_t UNUSED bkg_stride, void *_buf, size_t buf_stride, size_t UNUSED bkg_stride, void *_buf,
void UNUSED *bkg, hid_t UNUSED dxpl_id) void UNUSED *bkg, hid_t UNUSED dxpl_id)
{ {
H5T_t *src = NULL, *dst = NULL; /*src and dst datatypes */ H5T_t *src, *dst; /*src and dst datatypes */
H5T_t *src_parent = NULL; /*parent type for src */ H5T_t *src_parent; /*parent type for src */
hid_t src_parent_id = -1; /*ID for parent of the source */ hid_t src_parent_id = -1; /*ID for parent of the source */
H5T_path_t *tpath; /* Conversion information */ H5T_path_t *tpath; /* Conversion information */
herr_t ret_value = SUCCEED; /* Return value */ herr_t ret_value = SUCCEED; /* Return value */
@ -2941,24 +2941,17 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype") HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
src_parent = src->shared->parent; src_parent = src->shared->parent;
if(H5T_INTEGER != src_parent->shared->type)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "the base type of the source enum is not an integer type")
if(NULL == (tpath = H5T_path_find(src_parent, dst, NULL, NULL, dxpl_id, FALSE))) { if(NULL == (tpath = H5T_path_find(src_parent, dst, NULL, NULL, dxpl_id, FALSE))) {
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype") HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
} else if (!H5T_path_noop(tpath)) { } else if(!H5T_path_noop(tpath)) {
if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0) if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion") HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
/* Convert the data */
if(H5T_convert(tpath, src_parent_id, dst_id, nelmts, buf_stride, bkg_stride, _buf, bkg, dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
} }
/* Convert the data */
if(H5T_convert(tpath, src_parent_id, dst_id, nelmts, buf_stride, bkg_stride, _buf, bkg, dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
/* Release the temporary datatype IDs used */
if(src_parent_id >= 0)
H5I_dec_ref(src_parent_id);
break; break;
default: default:
@ -2967,6 +2960,10 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
} /* end switch */ } /* end switch */
done: done:
/* Release the temporary datatype IDs used */
if(src_parent_id >= 0)
H5I_dec_ref(src_parent_id);
FUNC_LEAVE_NOAPI(ret_value) FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T__conv_enum_numeric() */ } /* end H5T__conv_enum_numeric() */

10
test/enum.c
View File

@ -134,7 +134,7 @@ test_conv(hid_t file)
static c_e1 data1[]={E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE, static c_e1 data1[]={E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE,
E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED, E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED,
E1_RED, E1_BLUE, E1_GREEN, E1_BLACK, E1_WHITE, E1_RED, E1_BLUE, E1_GREEN, E1_BLACK, E1_WHITE,
E1_RED, E1_WHITE, 0, -1, -2}; E1_RED, E1_WHITE, (c_e1)0, (c_e1)-1, (c_e1)-2};
c_e1 data2[NELMTS(data1)]; c_e1 data2[NELMTS(data1)];
short data_short[NELMTS(data1)]; short data_short[NELMTS(data1)];
int data_int[NELMTS(data1)]; int data_int[NELMTS(data1)];
@ -178,7 +178,7 @@ test_conv(hid_t file)
if(H5Dread(dset, H5T_NATIVE_SHORT, space, space, H5P_DEFAULT, data_short) < 0) FAIL_STACK_ERROR if(H5Dread(dset, H5T_NATIVE_SHORT, space, space, H5P_DEFAULT, data_short) < 0) FAIL_STACK_ERROR
for(i = 0; i < (size_t)ds_size[0]; i++) for(i = 0; i < (size_t)ds_size[0]; i++)
if(data1[i] != data_short[i]) { if((short)data1[i] != data_short[i]) {
H5_FAILED(); H5_FAILED();
printf(" 2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n", printf(" 2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n",
(unsigned long)i, (int)(data1[i]), (unsigned long)i, (int)(data1[i]),
@ -190,7 +190,7 @@ test_conv(hid_t file)
if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, data_double) < 0) FAIL_STACK_ERROR if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, data_double) < 0) FAIL_STACK_ERROR
for(i = 0; i < (size_t)ds_size[0]; i++) for(i = 0; i < (size_t)ds_size[0]; i++)
if(data1[i] != (int)data_double[i]) { if(data1[i] != (unsigned)data_double[i]) {
H5_FAILED(); H5_FAILED();
printf(" 3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", printf(" 3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
(unsigned long)i, (int)(data1[i]), (unsigned long)i, (int)(data1[i]),
@ -212,7 +212,7 @@ test_conv(hid_t file)
if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, data_int) < 0) FAIL_STACK_ERROR if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, data_int) < 0) FAIL_STACK_ERROR
for(i = 0; i < (size_t)ds_size[0]; i++) for(i = 0; i < (size_t)ds_size[0]; i++)
if(data1[i] != data_int[i]) { if((int)data1[i] != data_int[i]) {
H5_FAILED(); H5_FAILED();
printf(" 4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n", printf(" 4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n",
(unsigned long)i, (int)(data1[i]), (unsigned long)i, (int)(data1[i]),
@ -234,7 +234,7 @@ test_conv(hid_t file)
if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, data_double) < 0) FAIL_STACK_ERROR if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, data_double) < 0) FAIL_STACK_ERROR
for(i = 0; i < (size_t)ds_size[0]; i++) for(i = 0; i < (size_t)ds_size[0]; i++)
if(data1[i] != (int)data_double[i]) { if(data1[i] != (unsigned)data_double[i]) {
H5_FAILED(); H5_FAILED();
printf(" 5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", printf(" 5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n",
(unsigned long)i, (int)(data1[i]), (unsigned long)i, (int)(data1[i]),