diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-06-09 22:09:08 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-06-09 22:09:08 (GMT) |
| commit | 005bf26ff83fcd28255a77fb9bbb4a64495cb4a2 (patch) | |
| tree | cbaf52a8a57f0fb6ad45c74b3193e6ee55ecbc78 /src/H5Dfarray.c | |
| parent | eaedb70001536ae6c2a7f753c3a358f0e8ce5011 (diff) | |
| download | hdf5-005bf26ff83fcd28255a77fb9bbb4a64495cb4a2.zip hdf5-005bf26ff83fcd28255a77fb9bbb4a64495cb4a2.tar.gz hdf5-005bf26ff83fcd28255a77fb9bbb4a64495cb4a2.tar.bz2 | |
Revert "Merge pull request #567 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop"
This reverts commit 4242753848c44ab3b5d226e66225eac2f64db314, reversing
changes made to b0e79fe6dd20ec7aa1b3e5f0f8b370639a4ef5bd.
Diffstat (limited to 'src/H5Dfarray.c')
| -rw-r--r-- | src/H5Dfarray.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index 486fb54..d183a8c 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -217,9 +217,6 @@ H5FL_DEFINE_STATIC(H5D_farray_ctx_t); /* Declare a free list to manage the H5D_farray_ctx_ud_t struct */ H5FL_DEFINE_STATIC(H5D_farray_ctx_ud_t); -/* Declare a free list to manage the H5O_layout_t struct */ -H5FL_EXTERN(H5O_layout_t); - /*------------------------------------------------------------------------- * Function: H5D__farray_crt_context @@ -472,7 +469,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr) H5D_farray_ctx_ud_t *dbg_ctx = NULL; /* Context for fixed array callback */ H5O_loc_t obj_loc; /* Pointer to an object's location */ hbool_t obj_opened = FALSE; /* Flag to indicate that the object header was opened */ - H5O_layout_t *layout = NULL; /* Layout message */ + H5O_layout_t layout; /* Layout message */ void *ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC @@ -496,9 +493,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr) obj_opened = TRUE; /* Read the layout message */ - if(NULL == (layout = H5FL_CALLOC(H5O_layout_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't get memory for layout") - if(NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, layout, dxpl_id)) + if(NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, &layout, dxpl_id)) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't get layout info") /* close the object header */ @@ -507,7 +502,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr) /* Create user data */ dbg_ctx->f = f; - dbg_ctx->chunk_size = layout->u.chunk.size; + dbg_ctx->chunk_size = layout.u.chunk.size; /* Set return value */ ret_value = dbg_ctx; @@ -526,9 +521,6 @@ done: } /* end if */ } /* end if */ - if(layout) - layout = H5FL_FREE(H5O_layout_t, layout); - FUNC_LEAVE_NOAPI(ret_value) } /* end H5D__farray_crt_dbg_context() */ |