[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:
This commit is contained in:
Fang Guo 2005-09-13 14:13:42 -05:00
parent 0bd4a240e0
commit c8da2c7fdc

View File

@ -16,50 +16,50 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * 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 * Purpose: This machine-generated source code contains
* information about the various integer and * information about the various integer and
* floating point numeric formats found on this * floating point numeric formats found on this
* architecture. The parameters below should be * architecture. The parameters below should be
* checked carefully and errors reported to the * checked carefully and errors reported to the
* HDF5 maintainer. * HDF5 maintainer.
* *
* Each of the numeric formats listed below are * Each of the numeric formats listed below are
* printed from most significant bit to least * printed from most significant bit to least
* significant bit even though the actual bytes * significant bit even though the actual bytes
* might be stored in a different order in * might be stored in a different order in
* memory. The integers above each binary byte * memory. The integers above each binary byte
* indicate the relative order of the bytes in * indicate the relative order of the bytes in
* memory; little-endian machines have * memory; little-endian machines have
* decreasing numbers while big-endian machines * decreasing numbers while big-endian machines
* have increasing numbers. * have increasing numbers.
* *
* The fields of the numbers are printed as * The fields of the numbers are printed as
* letters with `S' for the mantissa sign bit, * letters with `S' for the mantissa sign bit,
* `M' for the mantissa magnitude, and `E' for * `M' for the mantissa magnitude, and `E' for
* the exponent. The exponent has an associated * the exponent. The exponent has an associated
* bias which can be subtracted to find the * bias which can be subtracted to find the
* true exponent. The radix point is assumed * true exponent. The radix point is assumed
* to be before the first `M' bit. Any bit * to be before the first `M' bit. Any bit
* of a floating-point value not falling into one * of a floating-point value not falling into one
* of these categories is printed as a question * of these categories is printed as a question
* mark. Bits of integer types are printed as * mark. Bits of integer types are printed as
* `I' for 2's complement and `U' for magnitude. * `I' for 2's complement and `U' for magnitude.
* *
* If the most significant bit of the normalized * If the most significant bit of the normalized
* mantissa (always a `1' except for `0.0') is * mantissa (always a `1' except for `0.0') is
* not stored then an `implicit=yes' appears * not stored then an `implicit=yes' appears
* under the field description. In thie case, * under the field description. In thie case,
* the radix point is still assumed to be * the radix point is still assumed to be
* before the first `M' but after the implicit * before the first `M' but after the implicit
* bit. * bit.
* *
* Modifications: * Modifications:
* *
* DO NOT MAKE MODIFICATIONS TO THIS FILE! * DO NOT MAKE MODIFICATIONS TO THIS FILE!
* It was generated by code in `H5detect.c'. * It was generated by code in `H5detect.c'.
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -81,8 +81,8 @@ H5FL_EXTERN(H5T_shared_t);
herr_t herr_t
H5TN_init_interface(void) H5TN_init_interface(void)
{ {
H5T_t *dt = NULL; H5T_t *dt = NULL;
herr_t ret_value = SUCCEED; herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL); FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL);
@ -91,12 +91,9 @@ H5TN_init_interface(void)
* IIIIIIII * IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 1; dt->shared->size = 1;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -115,12 +112,9 @@ H5TN_init_interface(void)
* UUUUUUUU * UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 1; dt->shared->size = 1;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -138,12 +132,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII * IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 2; dt->shared->size = 2;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -162,12 +153,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 2; dt->shared->size = 2;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -185,12 +173,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -209,12 +194,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -232,12 +214,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -256,12 +235,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -279,12 +255,9 @@ H5TN_init_interface(void)
* IIIIIIII * IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 1; dt->shared->size = 1;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -302,12 +275,9 @@ H5TN_init_interface(void)
* UUUUUUUU * UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 1; dt->shared->size = 1;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -325,12 +295,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII * IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 2; dt->shared->size = 2;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -348,12 +315,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 2; dt->shared->size = 2;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -371,12 +335,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -394,12 +355,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -419,12 +377,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -444,12 +399,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -469,12 +421,9 @@ H5TN_init_interface(void)
* IIIIIIII IIIIIIII IIIIIIII IIIIIIII * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -495,12 +444,9 @@ H5TN_init_interface(void)
* UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_INTEGER; dt->shared->type = H5T_INTEGER;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -519,12 +465,9 @@ H5TN_init_interface(void)
* Implicit bit? yes * Implicit bit? yes
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_FLOAT; dt->shared->type = H5T_FLOAT;
dt->shared->size = 4; dt->shared->size = 4;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -553,12 +496,9 @@ H5TN_init_interface(void)
* Implicit bit? yes * Implicit bit? yes
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_FLOAT; dt->shared->type = H5T_FLOAT;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -587,12 +527,9 @@ H5TN_init_interface(void)
* Implicit bit? yes * Implicit bit? yes
* Alignment: none * Alignment: none
*/ */
if (NULL==(dt = H5FL_CALLOC (H5T_t))) if(NULL == (dt = H5T_alloc()))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed"); HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t))) dt->shared->state = H5T_STATE_IMMUTABLE;
{ 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;
dt->shared->type = H5T_FLOAT; dt->shared->type = H5T_FLOAT;
dt->shared->size = 8; dt->shared->size = 8;
dt->shared->u.atomic.order = H5T_ORDER_LE; dt->shared->u.atomic.order = H5T_ORDER_LE;
@ -624,8 +561,11 @@ H5TN_init_interface(void)
done: done:
if(ret_value<0) { if(ret_value<0) {
if(dt!=NULL) if(dt != NULL) {
H5FL_FREE(H5T_t,dt); if(dt->shared != NULL)
H5FL_FREE(H5T_shared_t, dt->shared);
H5FL_FREE(H5T_t, dt);
} /* end if */
} }
FUNC_LEAVE_NOAPI(ret_value); FUNC_LEAVE_NOAPI(ret_value);