summaryrefslogtreecommitdiffstats
path: root/src/H5Dearray.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-06-09 22:09:08 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-06-09 22:09:08 (GMT)
commit005bf26ff83fcd28255a77fb9bbb4a64495cb4a2 (patch)
treecbaf52a8a57f0fb6ad45c74b3193e6ee55ecbc78 /src/H5Dearray.c
parenteaedb70001536ae6c2a7f753c3a358f0e8ce5011 (diff)
downloadhdf5-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/H5Dearray.c')
-rw-r--r--src/H5Dearray.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/H5Dearray.c b/src/H5Dearray.c
index a45d546..1df0a58 100644
--- a/src/H5Dearray.c
+++ b/src/H5Dearray.c
@@ -214,13 +214,10 @@ const H5EA_class_t H5EA_CLS_FILT_CHUNK[1]={{
/*******************/
/* Declare a free list to manage the H5D_earray_ctx_t struct */
-H5FL_DEFINE_STATIC(H5D_earray_ctx_t);
-
/* Declare a free list to manage the H5D_earray_ctx_ud_t struct */
+H5FL_DEFINE_STATIC(H5D_earray_ctx_t);
H5FL_DEFINE_STATIC(H5D_earray_ctx_ud_t);
-/* Declare a free list to manage the H5O_layout_t struct */
-H5FL_EXTERN(H5O_layout_t);
/*-------------------------------------------------------------------------
@@ -632,7 +629,7 @@ H5D__earray_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr)
H5D_earray_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
@@ -656,9 +653,7 @@ H5D__earray_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 */
@@ -667,7 +662,7 @@ H5D__earray_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;
@@ -686,9 +681,6 @@ done:
} /* end if */
} /* end if */
- if(layout)
- layout = H5FL_FREE(H5O_layout_t, layout);
-
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__earray_crt_dbg_context() */