diff options
| -rw-r--r-- | src/H5T.c | 20 | ||||
| -rw-r--r-- | src/H5Tconv.c | 488 | ||||
| -rw-r--r-- | src/H5Tprivate.h | 1 |
3 files changed, 266 insertions, 243 deletions
@@ -263,6 +263,7 @@ static herr_t H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func, hid_t dxpl_id); static herr_t H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_conv_t func, hid_t dxpl_id, hbool_t api_call); +static htri_t H5T_compiler_conv(H5T_t *src, H5T_t *dst); static herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc); static H5T_t *H5T_decode(const unsigned char *buf); @@ -2679,20 +2680,21 @@ H5Tcompiler_conv(hid_t src_id, hid_t dst_id) htri_t ret_value; H5T_t *src = NULL, *dst = NULL; - FUNC_ENTER_API(H5Tcompiler_conv, FAIL); + FUNC_ENTER_API(H5Tcompiler_conv, FAIL) /* Check args */ if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) || NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type"); + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type") /* Find it */ if((ret_value=H5T_compiler_conv(src, dst))<0) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found"); + HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } + /*------------------------------------------------------------------------- * Function: H5Tconvert @@ -4666,22 +4668,22 @@ H5T_path_bkg(const H5T_path_t *p) * *------------------------------------------------------------------------- */ -htri_t +static htri_t H5T_compiler_conv(H5T_t *src, H5T_t *dst) { + H5T_path_t *path; htri_t ret_value; - H5T_path_t *path = NULL; - FUNC_ENTER_NOAPI(H5T_compiler_conv, FAIL); + FUNC_ENTER_NOAPI_NOINIT(H5T_compiler_conv) /* Find it */ if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE))) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found"); + HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found") ret_value = (htri_t)path->is_hard; done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } diff --git a/src/H5Tconv.c b/src/H5Tconv.c index e5c050a..5cfdfba 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -183,10 +183,10 @@ H5FL_BLK_DEFINE_STATIC(array_seq); * destination. * */ -#define H5T_CONV_xX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_xX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_xX_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_xX_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ *((DT*)D) = (DT)(*((ST*)S)); \ } @@ -197,9 +197,9 @@ H5FL_BLK_DEFINE_STATIC(array_seq); * equal. In this case, do not return exception but make sure the maximum is assigned * to the destination. SLU - 2005/06/29 */ -#define H5T_CONV_Xx_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Xx_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ - H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ + H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ /* Let compiler convert if case is ignored by user handler*/ \ @@ -208,7 +208,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \ /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \ } else if (*((ST*)S) < (DT)(D_MIN)) { \ - H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ + H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ /* Let compiler convert if case is ignored by user handler*/ \ @@ -219,7 +219,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Xx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Xx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ *((DT*)D) = (D_MAX); \ } else if (*((ST*)S) < (DT)(D_MIN)) { \ @@ -228,7 +228,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Ux_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ux_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ src_id, dst_id, S, D, cb_struct.user_data); \ @@ -241,19 +241,19 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Ux_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ux_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ *((DT*)D) = (D_MAX); \ } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)<=sizeof(DT)); \ - H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_sU_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_sU_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) < 0) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ src_id, dst_id, S, D, cb_struct.user_data); \ @@ -266,19 +266,19 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_sU_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_sU_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) < 0) { \ *((DT*)D) = 0; \ } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)<=sizeof(DT)); \ - H5T_CONV(H5T_CONV_sU, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_sU, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_uS_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_uS_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (sizeof(ST)==sizeof(DT) && *((ST*)S) > (D_MAX)) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ src_id, dst_id, S, D, cb_struct.user_data); \ @@ -291,29 +291,29 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_uS_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_uS_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (sizeof(ST)==sizeof(DT) && *((ST*)S) > (D_MAX)) { \ *((DT*)D) = (D_MAX); \ } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)<=sizeof(DT)); \ - H5T_CONV(H5T_CONV_uS, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_uS, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)<=sizeof(DT)); \ - H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)>=sizeof(DT)); \ - H5T_CONV(H5T_CONV_Xx, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_Xx, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_Su_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) < 0) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ src_id, dst_id, S, D, cb_struct.user_data); \ @@ -335,7 +335,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) < 0) { \ *((DT*)D) = 0; \ } else if (sizeof(ST)>sizeof(DT) && *((ST*)S) > (DT)(D_MAX)) { \ @@ -344,22 +344,22 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)>=sizeof(DT)); \ - H5T_CONV(H5T_CONV_Su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_Su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)>=sizeof(DT)); \ - H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)>=sizeof(DT)); \ - H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_su_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ /* Assumes memory format of unsigned & signed integers is same */ \ if (*((ST*)S) < 0) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ @@ -373,7 +373,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_su_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ /* Assumes memory format of unsigned & signed integers is same */ \ if (*((ST*)S) < 0) { \ *((DT*)D) = 0; \ @@ -381,12 +381,12 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)==sizeof(DT)); \ - H5T_CONV(H5T_CONV_su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_us_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_us_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ /* Assumes memory format of unsigned & signed integers is same */ \ if (*((ST*)S) > (DT)(D_MAX)) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ @@ -400,7 +400,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_us_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_us_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ /* Assumes memory format of unsigned & signed integers is same */ \ if (*((ST*)S) > (DT)(D_MAX)) { \ *((DT*)D) = (D_MAX); \ @@ -408,20 +408,20 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)==sizeof(DT)); \ - H5T_CONV(H5T_CONV_us, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_us, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } -#define H5T_CONV_fF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_fF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)<=sizeof(DT)); \ - H5T_CONV(H5T_CONV_xX, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_xX, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } /* Same as H5T_CONV_Xx_CORE, except that instead of using D_MAX and D_MIN * when an overflow occurs, use the 'float' infinity values. */ -#define H5T_CONV_Ff_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ff_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ src_id, dst_id, S, D, cb_struct.user_data); \ @@ -443,7 +443,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Ff_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ff_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ *((DT*)D) = (H5T_NATIVE_FLOAT_POS_INF_g); \ } else if (*((ST*)S) < (DT)(D_MIN)) { \ @@ -452,9 +452,9 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Ff(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Ff(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ assert(sizeof(ST)>=sizeof(DT)); \ - H5T_CONV(H5T_CONV_Ff, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ + H5T_CONV(H5T_CONV_Ff, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } #define H5T_HI_LO_BIT_SET(TYP, V, LO, HI) { \ @@ -516,15 +516,15 @@ H5FL_BLK_DEFINE_STATIC(array_seq); LO = count; \ } -#define H5T_CONV_xF_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ - if (S_PREC > D_PREC) { \ +#define H5T_CONV_xF_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ + if (sprec > dprec) { \ unsigned low_bit_pos, high_bit_pos; \ \ /* Detect high & low bits set in source */ \ H5T_HI_LO_BIT_SET(ST, *((ST*)S), low_bit_pos, high_bit_pos) \ \ /* Check for more bits of precision in src than available in dst */ \ - if((high_bit_pos - low_bit_pos) >= D_PREC) { \ + if((high_bit_pos - low_bit_pos) >= dprec) { \ H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_PRECISION, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ @@ -540,25 +540,25 @@ H5FL_BLK_DEFINE_STATIC(array_seq); else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_xF_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_xF_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_xF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ - H5T_CONV(H5T_CONV_xF, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ +#define H5T_CONV_xF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ + H5T_CONV(H5T_CONV_xF, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } /* Quincey added the condition branch (else if (*((ST*)S) != (ST)((DT)(*((ST*)S))))). * It handles a special situation when the source is "float" and assigned the value * of "INT_MAX". Compilers do roundup making this value "INT_MAX+1". This branch * is to check that situation and return exception for some compilers, mainly GCC. - * The branch if (*((ST*)S) > (DT)(D_MAX) || (S_PREC < D_PREC && *((ST*)S) == + * The branch if (*((ST*)S) > (DT)(D_MAX) || (sprec < dprec && *((ST*)S) == * (DT)(D_MAX))) is for some compilers like Sun, HP, IBM, and SGI where under * the same situation the "int" doesn't overflow. SLU - 2005/9/12 */ -#define H5T_CONV_Fx_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ - if (*((ST*)S) > (DT)(D_MAX) || (S_PREC < D_PREC && *((ST*)S) == (DT)(D_MAX))) { \ - H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ +#define H5T_CONV_Fx_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ + if (*((ST*)S) > (DT)(D_MAX) || (sprec < dprec && *((ST*)S) == (DT)(D_MAX))) { \ + H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_HI, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ /* Let compiler convert if case is ignored by user handler*/ \ @@ -567,7 +567,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \ /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \ } else if (*((ST*)S) < (DT)(D_MIN)) { \ - H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ + H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_RANGE_LOW, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ /* Let compiler convert if case is ignored by user handler*/ \ @@ -576,7 +576,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") \ /* if(except_ret==H5T_CONV_HANDLED): Fall through, user handled it */ \ } else if (*((ST*)S) != (ST)((DT)(*((ST*)S)))) { \ - H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, \ + H5T_conv_ret_t except_ret = (cb_struct.func)(H5T_CONV_EXCEPT_TRUNCATE, \ src_id, dst_id, S, D, cb_struct.user_data); \ if(except_ret == H5T_CONV_UNHANDLED) \ /* Let compiler convert if case is ignored by user handler*/ \ @@ -588,7 +588,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); else \ *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Fx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_Fx_NOEX_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ if (*((ST*)S) > (DT)(D_MAX)) { \ *((DT*)D) = (D_MAX); \ } else if (*((ST*)S) < (DT)(D_MIN)) { \ @@ -598,23 +598,26 @@ H5FL_BLK_DEFINE_STATIC(array_seq); *((DT*)D) = (DT)(*((ST*)S)); \ } -#define H5T_CONV_Fx(STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ - H5T_CONV(H5T_CONV_Fx, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, S_PREC, D_PREC) \ +#define H5T_CONV_Fx(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ + H5T_CONV(H5T_CONV_Fx, long double, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \ } /* Since all "no exception" cores do the same thing (assign the value in the * source location to the destination location, using casting), use one "core" * to do them all. */ -#define H5T_CONV_NO_EXCEPT_CORE(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV_NO_EXCEPT_CORE(S,D,ST,DT,D_MIN,D_MAX) { \ *((DT*)D) = (DT)(*((ST*)S)); \ } /* The main part of every integer hardware conversion macro */ -#define H5T_CONV(GUTS,ATYPE,STYPE,DTYPE,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) { \ +#define H5T_CONV(GUTS,ATYPE,STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \ size_t elmtno; /*element number */ \ + size_t sprec; /*source precision */ \ + size_t dprec; /*destination precision */ \ uint8_t *src, *s; /*source buffer */ \ uint8_t *dst, *d; /*destination buffer */ \ + H5T_class_t tclass; /*datatype's class */ \ H5T_t *st, *dt; /*data type descriptors */ \ ATYPE aligned; /*aligned type */ \ hbool_t s_mv, d_mv; /*move data to align it? */ \ @@ -627,9 +630,9 @@ H5FL_BLK_DEFINE_STATIC(array_seq); case H5T_CONV_INIT: \ /* Sanity check and initialize statistics */ \ cdata->need_bkg = H5T_BKG_NO; \ - if (NULL==(st=H5I_object(src_id)) || NULL==(dt=H5I_object(dst_id))) \ - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \ - "unable to dereference datatype object ID") \ + if (NULL==(st=H5I_object(src_id)) || NULL==(dt=H5I_object(dst_id))) \ + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \ + "unable to dereference datatype object ID") \ if (st->shared->size!=sizeof(ST) || dt->shared->size!=sizeof(DT)) \ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \ "disagreement about datatype size") \ @@ -674,6 +677,25 @@ H5FL_BLK_DEFINE_STATIC(array_seq); 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 source and destination datatypes */ \ + if (NULL==(st=H5I_object(src_id)) || NULL==(dt=H5I_object(dst_id))) \ + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \ + "unable to dereference datatype object ID") \ + \ + /* Get source & destination precisions into a variable */ \ + tclass = st->shared->type; \ + HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT); \ + if(tclass == H5T_INTEGER) \ + sprec = st->shared->u.atomic.prec; \ + else \ + sprec = 1 + st->shared->u.atomic.u.f.msize; \ + tclass = dt->shared->type; \ + HDassert(tclass == H5T_INTEGER || tclass == H5T_FLOAT); \ + if(tclass == H5T_INTEGER) \ + dprec = dt->shared->u.atomic.prec; \ + else \ + dprec = 1 + dt->shared->u.atomic.u.f.msize; \ + \ /* The outer loop of the type conversion macro, controlling which */ \ /* direction the buffer is walked */ \ while (nelmts>0) { \ @@ -709,17 +731,17 @@ H5FL_BLK_DEFINE_STATIC(array_seq); if (s_mv && d_mv) { \ /* Alignment is required for both source and dest */ \ s = (uint8_t*)&aligned; \ - H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DALIGN,POST_SALIGN,POST_DALIGN,GUTS,s,d,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DALIGN,POST_SALIGN,POST_DALIGN,GUTS,s,d,ST,DT,D_MIN,D_MAX) \ } else if(s_mv) { \ /* Alignment is required only for source */ \ s = (uint8_t*)&aligned; \ - H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DNOALIGN,POST_SALIGN,POST_DNOALIGN,GUTS,s,dst,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP_OUTER(PRE_SALIGN,PRE_DNOALIGN,POST_SALIGN,POST_DNOALIGN,GUTS,s,dst,ST,DT,D_MIN,D_MAX) \ } else if(d_mv) { \ /* Alignment is required only for destination */ \ - H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DALIGN,POST_SNOALIGN,POST_DALIGN,GUTS,src,d,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DALIGN,POST_SNOALIGN,POST_DALIGN,GUTS,src,d,ST,DT,D_MIN,D_MAX) \ } else { \ /* Alignment is not required for both source and destination */ \ - H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DNOALIGN,POST_SNOALIGN,POST_DNOALIGN,GUTS,src,dst,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP_OUTER(PRE_SNOALIGN,PRE_DNOALIGN,POST_SNOALIGN,POST_DNOALIGN,GUTS,src,dst,ST,DT,D_MIN,D_MAX) \ } \ \ /* Decrement number of elements left to convert */ \ @@ -769,16 +791,16 @@ H5FL_BLK_DEFINE_STATIC(array_seq); } /* The outer wrapper for the type conversion loop, to check for an exception handling routine */ -#define H5T_CONV_LOOP_OUTER(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ +#define H5T_CONV_LOOP_OUTER(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \ if(cb_struct.func) { \ - H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \ } \ else { \ - H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,H5_GLUE(GUTS,_NOEX),S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,H5_GLUE(GUTS,_NOEX),S,D,ST,DT,D_MIN,D_MAX) \ } /* The inner loop of the type conversion macro, actually converting the elements */ -#define H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ +#define H5T_CONV_LOOP(PRE_SALIGN_GUTS,PRE_DALIGN_GUTS,POST_SALIGN_GUTS,POST_DALIGN_GUTS,GUTS,S,D,ST,DT,D_MIN,D_MAX) \ for (elmtno=0; elmtno<safe; elmtno++) { \ /* Handle source pre-alignment */ \ H5_GLUE(H5T_CONV_LOOP_,PRE_SALIGN_GUTS)(ST) \ @@ -787,7 +809,7 @@ H5FL_BLK_DEFINE_STATIC(array_seq); H5_GLUE(H5T_CONV_LOOP_,PRE_DALIGN_GUTS)(DT) \ \ /* ... user-defined stuff here -- the conversion ... */ \ - H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ + H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX) \ \ /* Handle source post-alignment */ \ H5_GLUE(H5T_CONV_LOOP_,POST_SALIGN_GUTS)(ST) \ @@ -802,12 +824,12 @@ H5FL_BLK_DEFINE_STATIC(array_seq); /* Macro to call the actual "guts" of the type conversion, or call the "no exception" guts */ #ifdef H5_WANT_DCONV_EXCEPTION -#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ +#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX) \ /* ... user-defined stuff here -- the conversion ... */ \ - H5_GLUE(GUTS,_CORE)(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) + H5_GLUE(GUTS,_CORE)(S,D,ST,DT,D_MIN,D_MAX) #else /* H5_WANT_DCONV_EXCEPTION */ -#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) \ - H5_GLUE(H5T_CONV_NO_EXCEPT,_CORE)(S,D,ST,DT,D_MIN,D_MAX,S_PREC,D_PREC) +#define H5T_CONV_LOOP_GUTS(GUTS,S,D,ST,DT,D_MIN,D_MAX) \ + H5_GLUE(H5T_CONV_NO_EXCEPT,_CORE)(S,D,ST,DT,D_MIN,D_MAX) #endif /* H5_WANT_DCONV_EXCEPTION */ @@ -4285,7 +4307,7 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_uchar, FAIL); - H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char, -, -, -, -); + H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4318,7 +4340,7 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_schar, FAIL); - H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, -, SCHAR_MAX, -, -); + H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, -, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4351,7 +4373,7 @@ H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_short, FAIL); - H5T_CONV_sS(SCHAR, SHORT, signed char, short, -, -, -, -); + H5T_CONV_sS(SCHAR, SHORT, signed char, short, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4384,7 +4406,7 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_ushort, FAIL); - H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short, -, -, -, -); + H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4417,7 +4439,7 @@ H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_short, FAIL); - H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, -, SHRT_MAX, -, -); + H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, -, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4450,7 +4472,7 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_ushort, FAIL); - H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short, -, -, -, -); + H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4482,7 +4504,7 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_int, FAIL); - H5T_CONV_sS(SCHAR, INT, signed char, int, -, -, -, -); + H5T_CONV_sS(SCHAR, INT, signed char, int, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4514,7 +4536,7 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_uint, FAIL); - H5T_CONV_sU(SCHAR, UINT, signed char, unsigned, -, -, -, -); + H5T_CONV_sU(SCHAR, UINT, signed char, unsigned, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4546,7 +4568,7 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_int, FAIL); - H5T_CONV_uS(UCHAR, INT, unsigned char, int, -, INT_MAX, -, -); + H5T_CONV_uS(UCHAR, INT, unsigned char, int, -, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4578,7 +4600,7 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_uint, FAIL); - H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned, -, -, -, -); + H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4610,7 +4632,7 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_long, FAIL); - H5T_CONV_sS(SCHAR, LONG, signed char, long, -, -, -, -); + H5T_CONV_sS(SCHAR, LONG, signed char, long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4643,7 +4665,7 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_ulong, FAIL); - H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long, -, -, -, -); + H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4675,7 +4697,7 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_long, FAIL); - H5T_CONV_uS(UCHAR, LONG, unsigned char, long, -, LONG_MAX, -, -); + H5T_CONV_uS(UCHAR, LONG, unsigned char, long, -, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4708,7 +4730,7 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_ulong, FAIL); - H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long, -, -, -, -); + H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4741,7 +4763,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL); - H5T_CONV_sS(SCHAR, LLONG, signed char, long_long, -, -, -, -); + H5T_CONV_sS(SCHAR, LLONG, signed char, long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4774,7 +4796,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL); - H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long, -, -, -, -); + H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4807,7 +4829,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL); - H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, -, LLONG_MAX, -, -); + H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, -, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4840,7 +4862,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL); - H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long, -, -, -, -); + H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4873,7 +4895,7 @@ H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_schar, FAIL); - H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX, -, -); + H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4906,7 +4928,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_uchar, FAIL); - H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4939,7 +4961,7 @@ H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_schar, FAIL); - H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, -, SCHAR_MAX, -, -); + H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, -, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -4972,7 +4994,7 @@ H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_uchar, FAIL); - H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5005,7 +5027,7 @@ H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_ushort, FAIL); - H5T_CONV_su(SHORT, USHORT, short, unsigned short, -, -, -, -); + H5T_CONV_su(SHORT, USHORT, short, unsigned short, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5038,7 +5060,7 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_short, FAIL); - H5T_CONV_us(USHORT, SHORT, unsigned short, short, -, SHRT_MAX, -, -); + H5T_CONV_us(USHORT, SHORT, unsigned short, short, -, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5071,7 +5093,7 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_int, FAIL); - H5T_CONV_sS(SHORT, INT, short, int, -, -, -, -); + H5T_CONV_sS(SHORT, INT, short, int, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5104,7 +5126,7 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_uint, FAIL); - H5T_CONV_sU(SHORT, UINT, short, unsigned, -, -, -, -); + H5T_CONV_sU(SHORT, UINT, short, unsigned, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5137,7 +5159,7 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_int, FAIL); - H5T_CONV_uS(USHORT, INT, unsigned short, int, -, INT_MAX, -, -); + H5T_CONV_uS(USHORT, INT, unsigned short, int, -, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5170,7 +5192,7 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_uint, FAIL); - H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned, -, -, -, -); + H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5203,7 +5225,7 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_long, FAIL); - H5T_CONV_sS(SHORT, LONG, short, long, -, -, -, -); + H5T_CONV_sS(SHORT, LONG, short, long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5236,7 +5258,7 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_ulong, FAIL); - H5T_CONV_sU(SHORT, ULONG, short, unsigned long, -, -, -, -); + H5T_CONV_sU(SHORT, ULONG, short, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5269,7 +5291,7 @@ H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_long, FAIL); - H5T_CONV_uS(USHORT, LONG, unsigned short, long, -, LONG_MAX, -, -); + H5T_CONV_uS(USHORT, LONG, unsigned short, long, -, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5302,7 +5324,7 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_ulong, FAIL); - H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long, -, -, -, -); + H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5335,7 +5357,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL); - H5T_CONV_sS(SHORT, LLONG, short, long_long, -, -, -, -); + H5T_CONV_sS(SHORT, LLONG, short, long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5368,7 +5390,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL); - H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long, -, -, -, -); + H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5401,7 +5423,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL); - H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, -, LLONG_MAX, -, -); + H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, -, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5434,7 +5456,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL); - H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long, -, -, -, -); + H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5467,7 +5489,7 @@ H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_schar, FAIL); - H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX, -, -); + H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5500,7 +5522,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_uchar, FAIL); - H5T_CONV_Su(INT, UCHAR, int, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Su(INT, UCHAR, int, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5533,7 +5555,7 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_schar, FAIL); - H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, -, SCHAR_MAX, -, -); + H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, -, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5566,7 +5588,7 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_uchar, FAIL); - H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5599,7 +5621,7 @@ H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_short, FAIL); - H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX, -, -); + H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5632,7 +5654,7 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_ushort, FAIL); - H5T_CONV_Su(INT, USHORT, int, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Su(INT, USHORT, int, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5665,7 +5687,7 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_short, FAIL); - H5T_CONV_Us(UINT, SHORT, unsigned, short, -, SHRT_MAX, -, -); + H5T_CONV_Us(UINT, SHORT, unsigned, short, -, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5698,7 +5720,7 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_ushort, FAIL); - H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5730,7 +5752,7 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_uint, FAIL); - H5T_CONV_su(INT, UINT, int, unsigned, -, -, -, -); + H5T_CONV_su(INT, UINT, int, unsigned, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5762,7 +5784,7 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_int, FAIL); - H5T_CONV_us(UINT, INT, unsigned, int, -, INT_MAX, -, -); + H5T_CONV_us(UINT, INT, unsigned, int, -, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5794,7 +5816,7 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_long, FAIL); - H5T_CONV_sS(INT, LONG, int, long, -, -, -, -); + H5T_CONV_sS(INT, LONG, int, long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5826,7 +5848,7 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_ulong, FAIL); - H5T_CONV_sU(INT, LONG, int, unsigned long, -, -, -, -); + H5T_CONV_sU(INT, LONG, int, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5858,7 +5880,7 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_long, FAIL); - H5T_CONV_uS(UINT, LONG, unsigned, long, -, LONG_MAX, -, -); + H5T_CONV_uS(UINT, LONG, unsigned, long, -, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5890,7 +5912,7 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_ulong, FAIL); - H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long, -, -, -, -); + H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5922,7 +5944,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL); - H5T_CONV_sS(INT, LLONG, int, long_long, -, -, -, -); + H5T_CONV_sS(INT, LLONG, int, long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5954,7 +5976,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL); - H5T_CONV_sU(INT, ULLONG, int, unsigned long_long, -, -, -, -); + H5T_CONV_sU(INT, ULLONG, int, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -5986,7 +6008,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL); - H5T_CONV_uS(UINT, LLONG, unsigned, long_long, -, LLONG_MAX, -, -); + H5T_CONV_uS(UINT, LLONG, unsigned, long_long, -, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6019,7 +6041,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL); - H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long, -, -, -, -); + H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6051,7 +6073,7 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_schar, FAIL); - H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX, -, -); + H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6083,7 +6105,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_uchar, FAIL); - H5T_CONV_Su(LONG, UCHAR, long, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Su(LONG, UCHAR, long, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6116,7 +6138,7 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_schar, FAIL); - H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, -, SCHAR_MAX, -, -); + H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, -, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6149,7 +6171,7 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_uchar, FAIL); - H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6181,7 +6203,7 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_short, FAIL); - H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX, -, -); + H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6214,7 +6236,7 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_ushort, FAIL); - H5T_CONV_Su(LONG, USHORT, long, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Su(LONG, USHORT, long, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6246,7 +6268,7 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_short, FAIL); - H5T_CONV_Us(ULONG, SHORT, unsigned long, short, -, SHRT_MAX, -, -); + H5T_CONV_Us(ULONG, SHORT, unsigned long, short, -, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6279,7 +6301,7 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_ushort, FAIL); - H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6311,7 +6333,7 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_int, FAIL); - H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX, -, -); + H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6343,7 +6365,7 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_uint, FAIL); - H5T_CONV_Su(LONG, UINT, long, unsigned, -, UINT_MAX, -, -); + H5T_CONV_Su(LONG, UINT, long, unsigned, -, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6375,7 +6397,7 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_int, FAIL); - H5T_CONV_Us(ULONG, INT, unsigned long, int, -, INT_MAX, -, -); + H5T_CONV_Us(ULONG, INT, unsigned long, int, -, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6407,7 +6429,7 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_uint, FAIL); - H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, -, UINT_MAX, -, -); + H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, -, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6439,7 +6461,7 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_ulong, FAIL); - H5T_CONV_su(LONG, ULONG, long, unsigned long, -, -, -, -); + H5T_CONV_su(LONG, ULONG, long, unsigned long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6471,7 +6493,7 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_long, FAIL); - H5T_CONV_us(ULONG, LONG, unsigned long, long, -, LONG_MAX, -, -); + H5T_CONV_us(ULONG, LONG, unsigned long, long, -, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6503,7 +6525,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL); - H5T_CONV_sS(LONG, LLONG, long, long_long, -, -, -, -); + H5T_CONV_sS(LONG, LLONG, long, long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6536,7 +6558,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL); - H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long, -, -, -, -); + H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6569,7 +6591,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_llong, FAIL); - H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX, -, -); + H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6602,7 +6624,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL); - H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long, -, -, -, -); + H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6635,7 +6657,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_schar, FAIL); - H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX, -, -); + H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6668,7 +6690,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL); - H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6701,7 +6723,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL); - H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, -, SCHAR_MAX, -, -); + H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, -, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6734,7 +6756,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL); - H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, -, UCHAR_MAX, -, -); + H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, -, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6767,7 +6789,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_short, FAIL); - H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX, -, -); + H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6800,7 +6822,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL); - H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6833,7 +6855,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL); - H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, -, SHRT_MAX, -, -); + H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, -, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6866,7 +6888,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL); - H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, -, USHRT_MAX, -, -); + H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, -, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6898,7 +6920,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_int, FAIL); - H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX, -, -); + H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6930,7 +6952,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL); - H5T_CONV_Su(LLONG, UINT, long_long, unsigned, -, UINT_MAX, -, -); + H5T_CONV_Su(LLONG, UINT, long_long, unsigned, -, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6962,7 +6984,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL); - H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, -, INT_MAX, -, -); + H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, -, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -6995,7 +7017,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL); - H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, -, UINT_MAX, -, -); + H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, -, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7027,7 +7049,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_long, FAIL); - H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX, -, -); + H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7060,7 +7082,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL); - H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, -, ULONG_MAX, -, -); + H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, -, ULONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7093,7 +7115,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL); - H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, -, LONG_MAX, -, -); + H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, -, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7126,7 +7148,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL); - H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, -, ULONG_MAX, -, -); + H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, -, ULONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7159,7 +7181,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL); - H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long, -, -, -, -); + H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7192,7 +7214,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL); - H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, -, LLONG_MAX, -, -); + H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, -, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7229,7 +7251,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_double, FAIL); - H5T_CONV_fF(FLOAT, DOUBLE, float, double, -, -, -, -); + H5T_CONV_fF(FLOAT, DOUBLE, float, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7263,7 +7285,7 @@ H5T_conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_ldouble, FAIL); - H5T_CONV_fF(FLOAT, LDOUBLE, float, long double, -, -, -, -); + H5T_CONV_fF(FLOAT, LDOUBLE, float, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7304,7 +7326,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_float, FAIL); - H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX, -, -); + H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7338,7 +7360,7 @@ H5T_conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_ldouble, FAIL); - H5T_CONV_fF(DOUBLE, LDOUBLE, double, long double, -, -, -, -); + H5T_CONV_fF(DOUBLE, LDOUBLE, double, long double, -, -); done: @@ -7373,7 +7395,7 @@ H5T_conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_float, FAIL); - H5T_CONV_Ff(LDOUBLE, FLOAT, long double, float, -FLT_MAX, FLT_MAX, -, -); + H5T_CONV_Ff(LDOUBLE, FLOAT, long double, float, -FLT_MAX, FLT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7407,7 +7429,7 @@ H5T_conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_double, FAIL); - H5T_CONV_Ff(LDOUBLE, DOUBLE, long double, double, -DBL_MAX, DBL_MAX, -, -); + H5T_CONV_Ff(LDOUBLE, DOUBLE, long double, double, -DBL_MAX, DBL_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7440,7 +7462,7 @@ H5T_conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_float, FAIL); - H5T_CONV_xF(SCHAR, FLOAT, signed char, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(SCHAR, FLOAT, signed char, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7472,7 +7494,7 @@ H5T_conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_double, FAIL); - H5T_CONV_xF(SCHAR, DOUBLE, signed char, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(SCHAR, DOUBLE, signed char, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7505,7 +7527,7 @@ H5T_conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_schar_ldouble, FAIL); - H5T_CONV_xF(SCHAR, LDOUBLE, signed char, long double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(SCHAR, LDOUBLE, signed char, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7538,7 +7560,7 @@ H5T_conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_float, FAIL); - H5T_CONV_xF(UCHAR, FLOAT, unsigned char, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(UCHAR, FLOAT, unsigned char, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7570,7 +7592,7 @@ H5T_conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_double, FAIL); - H5T_CONV_xF(UCHAR, DOUBLE, unsigned char, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(UCHAR, DOUBLE, unsigned char, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7603,7 +7625,7 @@ H5T_conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uchar_ldouble, FAIL); - H5T_CONV_xF(UCHAR, LDOUBLE, unsigned char, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(UCHAR, LDOUBLE, unsigned char, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7636,7 +7658,7 @@ H5T_conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_float, FAIL); - H5T_CONV_xF(SHORT, FLOAT, short, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(SHORT, FLOAT, short, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7668,7 +7690,7 @@ H5T_conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_double, FAIL); - H5T_CONV_xF(SHORT, DOUBLE, short, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(SHORT, DOUBLE, short, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7701,7 +7723,7 @@ H5T_conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_short_ldouble, FAIL); - H5T_CONV_xF(SHORT, LDOUBLE, short, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(SHORT, LDOUBLE, short, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7734,7 +7756,7 @@ H5T_conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_float, FAIL); - H5T_CONV_xF(USHORT, FLOAT, unsigned short, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(USHORT, FLOAT, unsigned short, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7766,7 +7788,7 @@ H5T_conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_double, FAIL); - H5T_CONV_xF(USHORT, DOUBLE, unsigned short, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(USHORT, DOUBLE, unsigned short, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7799,7 +7821,7 @@ H5T_conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ushort_ldouble, FAIL); - H5T_CONV_xF(USHORT, LDOUBLE, unsigned short, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(USHORT, LDOUBLE, unsigned short, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7832,7 +7854,7 @@ H5T_conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_float, FAIL); - H5T_CONV_xF(INT, FLOAT, int, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(INT, FLOAT, int, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7864,7 +7886,7 @@ H5T_conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_double, FAIL); - H5T_CONV_xF(INT, DOUBLE, int, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(INT, DOUBLE, int, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7897,7 +7919,7 @@ H5T_conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_int_ldouble, FAIL); - H5T_CONV_xF(INT, LDOUBLE, int, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(INT, LDOUBLE, int, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7930,7 +7952,7 @@ H5T_conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_float, FAIL); - H5T_CONV_xF(UINT, FLOAT, unsigned int, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(UINT, FLOAT, unsigned int, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7962,7 +7984,7 @@ H5T_conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_double, FAIL); - H5T_CONV_xF(UINT, DOUBLE, unsigned int, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(UINT, DOUBLE, unsigned int, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -7995,7 +8017,7 @@ H5T_conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_uint_ldouble, FAIL); - H5T_CONV_xF(UINT, LDOUBLE, unsigned int, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(UINT, LDOUBLE, unsigned int, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8028,7 +8050,7 @@ H5T_conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_float, FAIL); - H5T_CONV_xF(LONG, FLOAT, long, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(LONG, FLOAT, long, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8060,7 +8082,7 @@ H5T_conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_double, FAIL); - H5T_CONV_xF(LONG, DOUBLE, long, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(LONG, DOUBLE, long, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8093,7 +8115,7 @@ H5T_conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_long_ldouble, FAIL); - H5T_CONV_xF(LONG, LDOUBLE, long, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(LONG, LDOUBLE, long, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8127,7 +8149,7 @@ H5T_conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_float, FAIL); - H5T_CONV_xF(ULONG, FLOAT, unsigned long, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(ULONG, FLOAT, unsigned long, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8161,7 +8183,7 @@ H5T_conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_double, FAIL); - H5T_CONV_xF(ULONG, DOUBLE, unsigned long, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(ULONG, DOUBLE, unsigned long, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8195,7 +8217,7 @@ H5T_conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ulong_ldouble, FAIL); - H5T_CONV_xF(ULONG, LDOUBLE, unsigned long, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(ULONG, LDOUBLE, unsigned long, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8228,7 +8250,7 @@ H5T_conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_float, FAIL); - H5T_CONV_xF(LLONG, FLOAT, long_long, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(LLONG, FLOAT, long_long, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8260,7 +8282,7 @@ H5T_conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_double, FAIL); - H5T_CONV_xF(LLONG, DOUBLE, long_long, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(LLONG, DOUBLE, long_long, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8293,7 +8315,7 @@ H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_llong_ldouble, FAIL); - H5T_CONV_xF(LLONG, LDOUBLE, long_long, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(LLONG, LDOUBLE, long_long, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8327,7 +8349,7 @@ H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_float, FAIL); - H5T_CONV_xF(ULLONG, FLOAT, unsigned long_long, float, -, -, H5Tget_precision(src_id), FLT_MANT_DIG); + H5T_CONV_xF(ULLONG, FLOAT, unsigned long_long, float, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8361,7 +8383,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_double, FAIL); - H5T_CONV_xF(ULLONG, DOUBLE, unsigned long_long, double, -, -, H5Tget_precision(src_id), DBL_MANT_DIG); + H5T_CONV_xF(ULLONG, DOUBLE, unsigned long_long, double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8395,7 +8417,7 @@ H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ullong_ldouble, FAIL); - H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long_long, long double, -, -, H5Tget_precision(src_id), LDBL_MANT_DIG); + H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long_long, long double, -, -); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8428,7 +8450,7 @@ H5T_conv_float_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_schar, FAIL); - H5T_CONV_Fx(FLOAT, SCHAR, float, signed char, SCHAR_MIN, SCHAR_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, SCHAR, float, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8460,7 +8482,7 @@ H5T_conv_float_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_uchar, FAIL); - H5T_CONV_Fx(FLOAT, UCHAR, float, unsigned char, 0, UCHAR_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, UCHAR, float, unsigned char, 0, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8492,7 +8514,7 @@ H5T_conv_double_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_schar, FAIL); - H5T_CONV_Fx(DOUBLE, SCHAR, double, signed char, SCHAR_MIN, SCHAR_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, SCHAR, double, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8524,7 +8546,7 @@ H5T_conv_double_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_uchar, FAIL); - H5T_CONV_Fx(DOUBLE, UCHAR, double, unsigned char, 0, UCHAR_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, UCHAR, double, unsigned char, 0, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8557,7 +8579,7 @@ H5T_conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_schar, FAIL); - H5T_CONV_Fx(LDOUBLE, SCHAR, long double, signed char, SCHAR_MIN, SCHAR_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, SCHAR, long double, signed char, SCHAR_MIN, SCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8591,7 +8613,7 @@ H5T_conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_uchar, FAIL); - H5T_CONV_Fx(LDOUBLE, UCHAR, long double, unsigned char, 0, UCHAR_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, UCHAR, long double, unsigned char, 0, UCHAR_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8624,7 +8646,7 @@ H5T_conv_float_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_short, FAIL); - H5T_CONV_Fx(FLOAT, SHORT, float, short, SHRT_MIN, SHRT_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, SHORT, float, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8656,7 +8678,7 @@ H5T_conv_float_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_ushort, FAIL); - H5T_CONV_Fx(FLOAT, USHORT, float, unsigned short, 0, USHRT_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, USHORT, float, unsigned short, 0, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8688,7 +8710,7 @@ H5T_conv_double_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_short, FAIL); - H5T_CONV_Fx(DOUBLE, SHORT, double, short, SHRT_MIN, SHRT_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, SHORT, double, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8720,7 +8742,7 @@ H5T_conv_double_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_ushort, FAIL); - H5T_CONV_Fx(DOUBLE, USHORT, double, unsigned short, 0, USHRT_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, USHORT, double, unsigned short, 0, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8753,7 +8775,7 @@ H5T_conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_short, FAIL); - H5T_CONV_Fx(LDOUBLE, SHORT, long double, short, SHRT_MIN, SHRT_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, SHORT, long double, short, SHRT_MIN, SHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8787,7 +8809,7 @@ H5T_conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_ushort, FAIL); - H5T_CONV_Fx(LDOUBLE, USHORT, long double, unsigned short, 0, USHRT_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, USHORT, long double, unsigned short, 0, USHRT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8820,7 +8842,7 @@ H5T_conv_float_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_int, FAIL); - H5T_CONV_Fx(FLOAT, INT, float, int, INT_MIN, INT_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, INT, float, int, INT_MIN, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8852,7 +8874,7 @@ H5T_conv_float_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_uint, FAIL); - H5T_CONV_Fx(FLOAT, UINT, float, unsigned int, 0, UINT_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, UINT, float, unsigned int, 0, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8884,7 +8906,7 @@ H5T_conv_double_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_int, FAIL); - H5T_CONV_Fx(DOUBLE, INT, double, int, INT_MIN, INT_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, INT, double, int, INT_MIN, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8916,7 +8938,7 @@ H5T_conv_double_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_uint, FAIL); - H5T_CONV_Fx(DOUBLE, UINT, double, unsigned int, 0, UINT_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, UINT, double, unsigned int, 0, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8949,7 +8971,7 @@ H5T_conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_int, FAIL); - H5T_CONV_Fx(LDOUBLE, INT, long double, int, INT_MIN, INT_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, INT, long double, int, INT_MIN, INT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -8983,7 +9005,7 @@ H5T_conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_uint, FAIL); - H5T_CONV_Fx(LDOUBLE, UINT, long double, unsigned int, 0, UINT_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, UINT, long double, unsigned int, 0, UINT_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9016,7 +9038,7 @@ H5T_conv_float_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_long, FAIL); - H5T_CONV_Fx(FLOAT, LONG, float, long, LONG_MIN, LONG_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, LONG, float, long, LONG_MIN, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9048,7 +9070,7 @@ H5T_conv_float_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_ulong, FAIL); - H5T_CONV_Fx(FLOAT, ULONG, float, unsigned long, 0, ULONG_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, ULONG, float, unsigned long, 0, ULONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9080,7 +9102,7 @@ H5T_conv_double_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_long, FAIL); - H5T_CONV_Fx(DOUBLE, LONG, double, long, LONG_MIN, LONG_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, LONG, double, long, LONG_MIN, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9112,7 +9134,7 @@ H5T_conv_double_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_ulong, FAIL); - H5T_CONV_Fx(DOUBLE, ULONG, double, unsigned long, 0, ULONG_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, ULONG, double, unsigned long, 0, ULONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9145,7 +9167,7 @@ H5T_conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_long, FAIL); - H5T_CONV_Fx(LDOUBLE, LONG, long double, long, LONG_MIN, LONG_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, LONG, long double, long, LONG_MIN, LONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9179,7 +9201,7 @@ H5T_conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_ulong, FAIL); - H5T_CONV_Fx(LDOUBLE, ULONG, long double, unsigned long, 0, ULONG_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, ULONG, long double, unsigned long, 0, ULONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9213,7 +9235,7 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_llong, FAIL); - H5T_CONV_Fx(FLOAT, LLONG, float, long_long, LLONG_MIN, LLONG_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, LLONG, float, long_long, LLONG_MIN, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9247,7 +9269,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_float_ullong, FAIL); - H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long_long, 0, ULLONG_MAX, FLT_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long_long, 0, ULLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9281,7 +9303,7 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_llong, FAIL); - H5T_CONV_Fx(DOUBLE, LLONG, double, long_long, LLONG_MIN, LLONG_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, LLONG, double, long_long, LLONG_MIN, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9315,7 +9337,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_double_ullong, FAIL); - H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long_long, 0, ULLONG_MAX, DBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long_long, 0, ULLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9349,7 +9371,7 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_llong, FAIL); - H5T_CONV_Fx(LDOUBLE, LLONG, long double, long_long, LLONG_MIN, LLONG_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, LLONG, long double, long_long, LLONG_MIN, LLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); @@ -9383,7 +9405,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, FUNC_ENTER_NOAPI(H5T_conv_ldouble_ullong, FAIL); - H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long_long, 0, ULLONG_MAX, LDBL_MANT_DIG, H5Tget_precision(dst_id)); + H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long_long, 0, ULLONG_MAX); done: FUNC_LEAVE_NOAPI(ret_value); diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index c253136..0ec08a7 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -75,7 +75,6 @@ H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal); H5_DLL htri_t H5T_detect_class (const H5T_t *dt, H5T_class_t cls); H5_DLL size_t H5T_get_size(const H5T_t *dt); H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset); -H5_DLL htri_t H5T_compiler_conv(H5T_t *src, H5T_t *dst); H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE * stream); H5_DLL H5G_entry_t *H5T_entof(H5T_t *dt); H5_DLL htri_t H5T_is_immutable(const H5T_t *dt); |