diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 1998-09-02 21:16:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 1998-09-02 21:16:24 (GMT) |
| commit | 97f56b57a0e5f60e424cdcb887d243787d3f866a (patch) | |
| tree | 3716896dcc977cfcffca7742afd1ab13796999b7 /src/H5Shyper.c | |
| parent | 8fde009d734d3f20da992bdad8b50f7a1e99099e (diff) | |
| download | hdf5-97f56b57a0e5f60e424cdcb887d243787d3f866a.zip hdf5-97f56b57a0e5f60e424cdcb887d243787d3f866a.tar.gz hdf5-97f56b57a0e5f60e424cdcb887d243787d3f866a.tar.bz2 | |
[svn-r654] Fixed last bug (hah! ;-) for beta release, changed H5Gget_stat to H5Gget_objinfo
and renamed internal functions to match up with the renamed API functions.
Diffstat (limited to 'src/H5Shyper.c')
| -rw-r--r-- | src/H5Shyper.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c index cd0138c..0b2be16 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -87,7 +87,6 @@ const H5S_mconv_t H5S_HYPER_MCONV[1] = {{ "hslab", /*name */ H5S_SEL_HYPERSLABS, /*selection type */ H5S_hyper_init, /*initialize */ - H5S_hyper_init, /*initialize background */ H5S_hyper_mgath, /*gather */ H5S_hyper_mscat, /*scatter */ }}; @@ -122,8 +121,7 @@ H5S_hyper_init (const struct H5O_layout_t __unused__ *layout, sel_iter->hyp.elmt_left=space->select.num_elem; /* Allocate the position & initialize to invalid location */ - sel_iter->hyp.pos = H5MM_malloc(space->extent.u.simple.rank * - sizeof(hssize_t)); + sel_iter->hyp.pos = H5MM_malloc(space->extent.u.simple.rank * sizeof(hssize_t)); sel_iter->hyp.pos[0]=(-1); H5V_array_fill(sel_iter->hyp.pos, sel_iter->hyp.pos, sizeof(hssize_t), space->extent.u.simple.rank); @@ -1722,15 +1720,16 @@ H5S_hyper_release (H5S_t *space) space->select.num_elem=0; /* Release the per-dimension selection info */ - H5MM_xfree(space->select.sel_info.hyper.diminfo); + if(space->select.sel_info.hyper.diminfo!=NULL) + H5MM_xfree(space->select.sel_info.hyper.diminfo); space->select.sel_info.hyper.diminfo = NULL; /* Release hi and lo boundary information */ for(i=0; i<space->extent.u.simple.rank; i++) { H5MM_xfree(space->select.sel_info.hyper.hyper_lst->lo_bounds[i]); - space->select.sel_info.hyper.hyper_lst->lo_bounds[i] = NULL; + space->select.sel_info.hyper.hyper_lst->lo_bounds[i] = NULL; H5MM_xfree(space->select.sel_info.hyper.hyper_lst->hi_bounds[i]); - space->select.sel_info.hyper.hyper_lst->hi_bounds[i] = NULL; + space->select.sel_info.hyper.hyper_lst->hi_bounds[i] = NULL; } /* end for */ H5MM_xfree(space->select.sel_info.hyper.hyper_lst->lo_bounds); space->select.sel_info.hyper.hyper_lst->lo_bounds = NULL; |