summaryrefslogtreecommitdiffstats
path: root/src/H5detect.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-09-12 06:02:55 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-09-12 06:02:55 (GMT)
commit5ffde305cdf2c167234f1ffb38adf557380f2234 (patch)
treef211c5a72d7332885ab83eca1270bcb131e1c6c9 /src/H5detect.c
parent966f5f42368663fb589807ae28b2887b98ed8067 (diff)
downloadhdf5-5ffde305cdf2c167234f1ffb38adf557380f2234.zip
hdf5-5ffde305cdf2c167234f1ffb38adf557380f2234.tar.gz
hdf5-5ffde305cdf2c167234f1ffb38adf557380f2234.tar.bz2
[svn-r11384] Purpose:
Code cleanup Description: Merge back changes from "compact group" work that improve the infrastructure of the library and may impact others. In this round of merging, that includes: - Move datatype allocation into single internal routine, instead of duplicated code that was spread out in a dozen or so places. - Clean up guts of object header routines (H5O_*) to allow for some of the fancieroperations that need to be performed on groups, along with some general improvements. - Added a new error code - Some minor cleanups in other code.... Platforms tested: FreeBSD 4.11 (sleipnir) Linux 2.4 Mac OS X
Diffstat (limited to 'src/H5detect.c')
-rw-r--r--src/H5detect.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/H5detect.c b/src/H5detect.c
index 62bdd1f..d2b77ac 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -557,15 +557,9 @@ H5TN_init_interface(void)\n\
/* The part common to fixed and floating types */
printf("\
- if (NULL==(dt = H5FL_CALLOC (H5T_t)))\n\
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,\"memory allocation failed\");\n\
- if (NULL==(dt->shared = H5FL_CALLOC(H5T_shared_t)))\n\
- { \
- H5FL_FREE(H5T_t, dt);\
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, \"memory allocation failed\");\n\
- } \
+ if(NULL == (dt = H5T_alloc()))\n\
+ HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,\"memory allocation failed\")\n\
dt->shared->state = H5T_STATE_IMMUTABLE;\n\
- dt->ent.header = HADDR_UNDEF;\n\
dt->shared->type = H5T_%s;\n\
dt->shared->size = %d;\n\
dt->shared->u.atomic.order = H5T_ORDER_%s;\n\
@@ -637,8 +631,11 @@ H5TN_init_interface(void)\n\
\n\
done:\n\
if(ret_value<0) {\n\
- if(dt!=NULL)\n\
- H5FL_FREE(H5T_t,dt);\n\
+ if(dt != NULL) {\n\
+ if(dt->shared != NULL)\n\
+ H5FL_FREE(H5T_shared_t, dt->shared);\n\
+ H5FL_FREE(H5T_t, dt);\n\
+ } /* end if */\n\
}\n\
\n\
FUNC_LEAVE_NOAPI(ret_value);\n}\n");