[svn-r8312] Purpose:

    Code optimization

Description:
    Eliminate unnecessary allocation and point at existing data structure
instead.

Platforms tested:
    Solaris 2.7 (arabica)
    too minor to require h5committest

2 files changed, 4 insertions, 24 deletions

diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 49279c9..d7aae0b 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -6151,8 +6151,8 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
 		      const hsize_t count[],
 		      const hsize_t *block)
 {
-    hsize_t *_stride=NULL;      /* Stride array */
-    hsize_t *_block=NULL;       /* Block size array */
+    hsize_t _stride[H5O_LAYOUT_NDIMS];      /* Stride array */
+    hsize_t _block[H5O_LAYOUT_NDIMS];       /* Block size array */
     unsigned u;                    /* Counters */
     H5S_hyper_dim_t *diminfo; /* per-dimension info for the selection */
     herr_t      ret_value=SUCCEED;       /* Return value */
@@ -6169,9 +6169,6 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     if(stride==NULL) {
         hsize_t fill=1;
 
-        /* Allocate temporary buffer */
-        if ((_stride=H5FL_ARR_MALLOC(hsize_t,space->extent.u.simple.rank))==NULL)
-            HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for stride buffer");
         H5V_array_fill(_stride,&fill,sizeof(hssize_t),space->extent.u.simple.rank);
         stride = _stride;
     } /* end if */
@@ -6180,9 +6177,6 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     if(block==NULL) {
         hsize_t fill=1;
 
-        /* Allocate temporary buffer */
-        if ((_block=H5FL_ARR_MALLOC(hsize_t,space->extent.u.simple.rank))==NULL)
-            HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for stride buffer");
         H5V_array_fill(_block,&fill,sizeof(hssize_t),space->extent.u.simple.rank);
         block = _block;
     } /* end if */
@@ -6352,10 +6346,6 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
         HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "invalid selection operation");
 
 done:
-    if(_stride!=NULL)
-        H5FL_ARR_FREE(hsize_t,_stride);
-    if(_block!=NULL)
-        H5FL_ARR_FREE(hsize_t,_block);
     FUNC_LEAVE_NOAPI(ret_value);
 }   /* end H5S_select_hyperslab() */
 
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 9156971..677d7d5 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -44,9 +44,6 @@ static herr_t H5S_select_iter_next_block(H5S_sel_iter_t *iter);
 /* Declare external the free list for hssize_t arrays */
 H5FL_ARR_EXTERN(hssize_t);
 
-/* Declare external the free list for hsize_t arrays */
-H5FL_ARR_EXTERN(hsize_t);
-
 /* Declare a free list to manage sequences of size_t */
 H5FL_SEQ_DEFINE_STATIC(size_t);
 
@@ -570,12 +567,8 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
     sel_iter->rank=space->extent.u.simple.rank;
 
     if(sel_iter->rank>0) {
-        /* Allocate room for the dataspace dimensions */
-        sel_iter->dims = H5FL_ARR_MALLOC(hsize_t,sel_iter->rank);
-        assert(sel_iter->dims);
-
-        /* Keep a copy of the dataspace dimensions */
-        HDmemcpy(sel_iter->dims,space->extent.u.simple.size,sel_iter->rank*sizeof(hsize_t));
+        /* Point to the dataspace dimensions */
+        sel_iter->dims=space->extent.u.simple.size;
     } /* end if */
     else
         sel_iter->dims = NULL;
@@ -839,9 +832,6 @@ H5S_select_iter_release(H5S_sel_iter_t *sel_iter)
     /* Check args */
     assert(sel_iter);
 
-    /* Release the array of dimensions common to all iterators */
-    H5FL_ARR_FREE(hsize_t,sel_iter->dims);
-
     /* Call selection type-specific release routine */
     ret_value = (*sel_iter->iter_release)(sel_iter);