diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2011-10-11 22:09:25 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2011-10-11 22:09:25 (GMT) |
commit | 0e0b6fc5abdd841f2272e299b185b4566619ae01 (patch) | |
tree | cc5c01121b75b77b8a3efa66717e537197e0ae94 /src/H5Tconv.c | |
parent | 268d79925ba45493c259a96c72c3e89f9d6472c3 (diff) | |
download | hdf5-0e0b6fc5abdd841f2272e299b185b4566619ae01.zip hdf5-0e0b6fc5abdd841f2272e299b185b4566619ae01.tar.gz hdf5-0e0b6fc5abdd841f2272e299b185b4566619ae01.tar.bz2 |
[svn-r21524] Reverts 20920 (HDFFV-7579 fix) (this is 20913/21 from the trunk)
This change reverts the HDFFV-7579 fix while we more carefully consider enum conversions as a part of the h5compare work.
Tested on jam, Windows 7 and linew.
Diffstat (limited to 'src/H5Tconv.c')
-rw-r--r-- | src/H5Tconv.c | 92 |
1 files changed, 2 insertions, 90 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 4df9f03..0de54c9 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -2699,19 +2699,6 @@ done: * * Programmer: Robb Matzke * Monday, January 4, 1999 - * - * Modifications: - * Robb Matzke, 1999-06-16 - * Added support for non-zero strides. If BUF_STRIDE is non-zero - * then convert one value at each memory location advancing - * BUF_STRIDE bytes each time; otherwise assume both source and - * destination values are packed. - * - * Raymond Lu, 2011-05-26 - * When overflow happened, the old way was to fill in the destination - * with 0xff. The new default way is to convert the source value - * to the destination. If the user sets the property through - * H5Pset_enum_conv_overflow, the library still uses the old way. *------------------------------------------------------------------------- */ herr_t @@ -2722,10 +2709,6 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, uint8_t *buf = (uint8_t*)_buf; /*cast for pointer arithmetic */ H5T_t *src = NULL, *dst = NULL; /*src and dst datatypes */ H5T_t *src_super = NULL, *dst_super = NULL; /*parent types for src and dst*/ - hid_t src_super_id = NULL, dst_super_id = NULL; /*parent type IDs for src and dst*/ - size_t src_super_size, dst_super_size; /*size of parent types for src and dst*/ - H5T_path_t *tpath; /*type conversion info */ - void *tmp_buf = NULL; /*small conversion buffer */ uint8_t *s = NULL, *d = NULL; /*src and dst BUF pointers */ int src_delta, dst_delta; /*conversion strides */ int n; /*src value cast as native int */ @@ -2733,7 +2716,6 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, H5P_genplist_t *plist; /*property list pointer */ H5T_conv_cb_t cb_struct; /*conversion callback structure */ H5T_conv_ret_t except_ret; /*return of callback function */ - hbool_t conv_overflow = TRUE; /* library's default behavior when overflow happens */ size_t i; /*counters */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2814,43 +2796,6 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, if(H5P_get(plist, H5D_XFER_CONV_CB_NAME, &cb_struct) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback") - /* Get the property of overflow handling */ - if(H5P_get(plist, H5D_XFER_CONV_ENUM_OVERFLOW_NAME, &conv_overflow) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback") - - /* Preparation for converting the data when overflow happens */ - if(conv_overflow) { - /* Retrieve base type for the source type */ - if(NULL == (src_super = H5T_get_super(src))) - HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "unable to get base type for the source type") - - /* Retrieve base type for the destination type */ - if(NULL == (dst_super = H5T_get_super(dst))) - HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "unable to get base type for the destination type") - - /* Find the conversion function */ - if(NULL == (tpath = H5T_path_find(src_super, dst_super, NULL, NULL, dxpl_id, FALSE))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to find convert path between src and dst types") - - /* The conversion function needs the type IDs */ - if((src_super_id = H5I_register(H5I_DATATYPE, src_super, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type") - - if((dst_super_id = H5I_register(H5I_DATATYPE, dst_super, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type") - - /* Get the size of the base types of src & dst */ - if(!(src_super_size = H5T_get_size(src_super))) - HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "unable to get type size") - - if(!(dst_super_size = H5T_get_size(dst_super))) - HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "unable to get type size") - - /* Conversion buffer for overflowing data */ - if(!(tmp_buf = HDmalloc(MAX(src_super_size, dst_super_size)))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to allocate buffer") - } - for(i = 0; i < nelmts; i++, s += src_delta, d += dst_delta) { if(priv->length) { /* Use O(1) lookup */ @@ -2876,17 +2821,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, } if(except_ret == H5T_CONV_UNHANDLED) { - if(conv_overflow) { - /* Copy the source data to a small buffer, convert it, then copy it back to the - * destination */ - HDmemcpy(tmp_buf, s, src_super_size); - if(H5T_convert(tpath, src_super_id, dst_super_id, 1, (size_t)0, (size_t)0, - tmp_buf, NULL, dxpl_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed") - HDmemcpy(d, tmp_buf, dst_super_size); - } else - /* Fill the destination with 0xff if we don't convert it */ - HDmemset(d, 0xff, dst->shared->size); + HDmemset(d, 0xff, dst->shared->size); } else if(except_ret == H5T_CONV_ABORT) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") } else { @@ -2919,18 +2854,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, } if(except_ret == H5T_CONV_UNHANDLED) { - if(conv_overflow) { - /* Copy the source data to a small buffer, convert it, then copy it back to the - * destination */ - HDmemcpy(tmp_buf, s, src_super_size); - if(H5T_convert(tpath, src_super_id, dst_super_id, 1, (size_t)0, (size_t)0, - tmp_buf, NULL, dxpl_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed") - HDmemcpy(d, tmp_buf, dst_super_size); - } else - /* Fill the destination with 0xff if we don't convert it */ - HDmemset(d, 0xff, dst->shared->size); - + HDmemset(d, 0xff, dst->shared->size); } else if(except_ret == H5T_CONV_ABORT) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") } /* end if */ @@ -2942,18 +2866,6 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, } } - /* Close the type IDs. Have to use public function here */ - if(conv_overflow) { - /* Disable the error stack for these two public functions. Otherwise they would - * clear it */ - H5E_BEGIN_TRY { - H5Tclose(src_super_id); - H5Tclose(dst_super_id); - } H5E_END_TRY; - - HDfree(tmp_buf); - } - break; default: |