summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-04-06 16:38:00 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-04-06 16:38:00 (GMT)
commit5bace59b991b704225f4338e70b79abaa57cf836 (patch)
tree93ad25835b181d70294938a01b72ec89274e3424
parent1a867ef2db84d89938e08dbfd7e86bbd1fa2d7f7 (diff)
downloadhdf5-5bace59b991b704225f4338e70b79abaa57cf836.zip
hdf5-5bace59b991b704225f4338e70b79abaa57cf836.tar.gz
hdf5-5bace59b991b704225f4338e70b79abaa57cf836.tar.bz2
[svn-r8307] Purpose:
Code optimization Description: Fix H5S_select_copy so it doesn't call calloc() for allocating memory that will be immediately overwritten. Platforms tested: Solaris 2.7 (arabica) too small to require h5committest
-rw-r--r--src/H5Sselect.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 7a758fc..9156971 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -139,9 +139,11 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src)
/* Copy offset information */
if(src->extent.u.simple.rank>0) {
- if (NULL==(dst->select.offset = H5FL_ARR_CALLOC(hssize_t,src->extent.u.simple.rank)))
+ if (NULL==(dst->select.offset = H5FL_ARR_MALLOC(hssize_t,src->extent.u.simple.rank)))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
- if(src->select.offset!=NULL)
+ if(src->select.offset==NULL)
+ HDmemset(dst->select.offset,0,(src->extent.u.simple.rank*sizeof(hssize_t)));
+ else
HDmemcpy(dst->select.offset,src->select.offset,(src->extent.u.simple.rank*sizeof(hssize_t)));
} /* end if */
else