From eb0e5f8c4ea29e674c97a8be048814e26379d4c1 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 8 Feb 2012 08:36:25 -0500 Subject: [svn-r21917] Description: Bring [spirit of] r20393 from coverity branch back to trunk: Move initialization ocrt_info.new_obj = NULL; before FUNC_ENTER_NOAPI -- gh Tested on: Mac OS X/64 10.7.3 (amazon) w/debug, production & parallel (too minor to require h5commitest) --- src/H5Dint.c | 2 +- src/H5G.c | 2 +- src/H5Tcommit.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/H5Dint.c b/src/H5Dint.c index 707a298..e138b2a 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -403,7 +403,7 @@ H5D_create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, H5D_obj_create_t dcrt_info; /* Information for dataset creation */ H5D_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5D_create_named, NULL) + FUNC_ENTER_NOAPI_NOINIT(H5D_create_named) /* Check arguments */ HDassert(loc); diff --git a/src/H5G.c b/src/H5G.c index 2cbca65..a9c28bf 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -276,7 +276,7 @@ H5G_create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id, H5G_obj_create_t gcrt_info; /* Information for group creation */ H5G_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5G_create_named, NULL) + FUNC_ENTER_NOAPI_NOINIT(H5G_create_named) /* Check arguments */ HDassert(loc); diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index d3779e5..26f021d 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -189,7 +189,7 @@ H5T_commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt, H5T_state_t old_state = H5T_STATE_TRANSIENT; /* The state of the datatype before H5T_commit. */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_commit_named, FAIL) + FUNC_ENTER_NOAPI_NOINIT(H5T_commit_named) /* Sanity checks */ HDassert(loc); -- cgit v0.12