From c8da2c7fdc74f5cfaf8b1ac27edcbb5ea12fe099 Mon Sep 17 00:00:00 2001 From: Fang Guo Date: Tue, 13 Sep 2005 14:13:42 -0500 Subject: [svn-r11407] Purpose: Maintenance on Windows Description: Changes made for windows due to the change of h5detect.c Solution: Platforms tested: MSVS 6.0, VS .Net, Intel 8.0 on Windows XP Misc. update: --- windows/src/H5Tinit.c | 280 ++++++++++++++++++++------------------------------ 1 file changed, 110 insertions(+), 170 deletions(-) diff --git a/windows/src/H5Tinit.c b/windows/src/H5Tinit.c index e06ead1..e6eb895 100755 --- a/windows/src/H5Tinit.c +++ b/windows/src/H5Tinit.c @@ -16,50 +16,50 @@ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Created: Mar 30, 2005 - * + * Created: Sep 13, 2005 + * * - * Purpose: This machine-generated source code contains - * information about the various integer and - * floating point numeric formats found on this - * architecture. The parameters below should be - * checked carefully and errors reported to the - * HDF5 maintainer. - * - * Each of the numeric formats listed below are - * printed from most significant bit to least - * significant bit even though the actual bytes - * might be stored in a different order in - * memory. The integers above each binary byte - * indicate the relative order of the bytes in - * memory; little-endian machines have - * decreasing numbers while big-endian machines - * have increasing numbers. - * - * The fields of the numbers are printed as - * letters with `S' for the mantissa sign bit, - * `M' for the mantissa magnitude, and `E' for - * the exponent. The exponent has an associated - * bias which can be subtracted to find the - * true exponent. The radix point is assumed - * to be before the first `M' bit. Any bit - * of a floating-point value not falling into one - * of these categories is printed as a question - * mark. Bits of integer types are printed as - * `I' for 2's complement and `U' for magnitude. - * - * If the most significant bit of the normalized - * mantissa (always a `1' except for `0.0') is - * not stored then an `implicit=yes' appears - * under the field description. In thie case, - * the radix point is still assumed to be - * before the first `M' but after the implicit - * bit. + * Purpose: This machine-generated source code contains + * information about the various integer and + * floating point numeric formats found on this + * architecture. The parameters below should be + * checked carefully and errors reported to the + * HDF5 maintainer. + * + * Each of the numeric formats listed below are + * printed from most significant bit to least + * significant bit even though the actual bytes + * might be stored in a different order in + * memory. The integers above each binary byte + * indicate the relative order of the bytes in + * memory; little-endian machines have + * decreasing numbers while big-endian machines + * have increasing numbers. + * + * The fields of the numbers are printed as + * letters with `S' for the mantissa sign bit, + * `M' for the mantissa magnitude, and `E' for + * the exponent. The exponent has an associated + * bias which can be subtracted to find the + * true exponent. The radix point is assumed + * to be before the first `M' bit. Any bit + * of a floating-point value not falling into one + * of these categories is printed as a question + * mark. Bits of integer types are printed as + * `I' for 2's complement and `U' for magnitude. + * + * If the most significant bit of the normalized + * mantissa (always a `1' except for `0.0') is + * not stored then an `implicit=yes' appears + * under the field description. In thie case, + * the radix point is still assumed to be + * before the first `M' but after the implicit + * bit. * * Modifications: * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5detect.c'. + * DO NOT MAKE MODIFICATIONS TO THIS FILE! + * It was generated by code in `H5detect.c'. * *------------------------------------------------------------------------- */ @@ -81,8 +81,8 @@ H5FL_EXTERN(H5T_shared_t); herr_t H5TN_init_interface(void) { - H5T_t *dt = NULL; - herr_t ret_value = SUCCEED; + H5T_t *dt = NULL; + herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL); @@ -91,12 +91,9 @@ H5TN_init_interface(void) * IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 1; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -115,12 +112,9 @@ H5TN_init_interface(void) * UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 1; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -138,12 +132,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 2; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -162,12 +153,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 2; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -185,12 +173,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -209,12 +194,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -232,12 +214,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -256,12 +235,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -279,12 +255,9 @@ H5TN_init_interface(void) * IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 1; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -302,12 +275,9 @@ H5TN_init_interface(void) * UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 1; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -325,12 +295,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 2; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -348,12 +315,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 2; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -371,12 +335,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -394,12 +355,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -419,12 +377,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -444,12 +399,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -469,12 +421,9 @@ H5TN_init_interface(void) * IIIIIIII IIIIIIII IIIIIIII IIIIIIII * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -495,12 +444,9 @@ H5TN_init_interface(void) * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_INTEGER; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -519,12 +465,9 @@ H5TN_init_interface(void) * Implicit bit? yes * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_FLOAT; dt->shared->size = 4; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -553,12 +496,9 @@ H5TN_init_interface(void) * Implicit bit? yes * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_FLOAT; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -587,12 +527,9 @@ H5TN_init_interface(void) * Implicit bit? yes * Alignment: none */ - if (NULL==(dt = H5FL_CALLOC (H5T_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); - if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) - { H5FL_FREE(H5T_t, dt); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - } dt->shared->state = H5T_STATE_IMMUTABLE; - dt->ent.header = HADDR_UNDEF; + if(NULL == (dt = H5T_alloc())) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed") + dt->shared->state = H5T_STATE_IMMUTABLE; dt->shared->type = H5T_FLOAT; dt->shared->size = 8; dt->shared->u.atomic.order = H5T_ORDER_LE; @@ -624,8 +561,11 @@ H5TN_init_interface(void) done: if(ret_value<0) { - if(dt!=NULL) - H5FL_FREE(H5T_t,dt); + if(dt != NULL) { + if(dt->shared != NULL) + H5FL_FREE(H5T_shared_t, dt->shared); + H5FL_FREE(H5T_t, dt); + } /* end if */ } FUNC_LEAVE_NOAPI(ret_value); -- cgit v0.12