diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1998-07-07 22:12:24 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1998-07-07 22:12:24 (GMT) |
| commit | 3748f79ca2f867ecd82dd159822918ad99059320 (patch) | |
| tree | 8e72a79fa8688f88b6defdcf226de1f8ae80e12f /src/H5Sselect.c | |
| parent | 5ab92f6c59b909c51225ff886f9b7a24fdd1dcf6 (diff) | |
| download | hdf5-3748f79ca2f867ecd82dd159822918ad99059320.zip hdf5-3748f79ca2f867ecd82dd159822918ad99059320.tar.gz hdf5-3748f79ca2f867ecd82dd159822918ad99059320.tar.bz2 | |
[svn-r463] H5S.c:
Moved the source of H5S_extent_npoints before H5Sextent_npoints to
reduce a compiler complaint.
H5Shyper.c:
H5Sprivate.h:
H5Spublic.h:
H5Sselect.c:
Changed the parameter declarations of H5S_hyper_add
and H5Sselect_hyperslab as originally intended as const hsize *.
Diffstat (limited to 'src/H5Sselect.c')
| -rw-r--r-- | src/H5Sselect.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 348b7ce..b089a43 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -159,10 +159,10 @@ H5S_select_release (H5S_t *space) herr_t H5Sselect_hyperslab(dsid, op, start, stride, count, block) hid_t dsid; IN: Dataspace ID of selection to modify H5S_seloper_t op; IN: Operation to perform on current selection - hssize_t *start; IN: Offset of start of hyperslab - hssize_t *stride; IN: Hyperslab stride - hssize_t *count; IN: Number of blocks included in hyperslab - hssize_t *block; IN: Size of block in hyperslab + const hssize_t *start; IN: Offset of start of hyperslab + const hssize_t *stride; IN: Hyperslab stride + const hssize_t *count; IN: Number of blocks included in hyperslab + const hssize_t *block; IN: Size of block in hyperslab RETURNS SUCCEED/FAIL DESCRIPTION @@ -177,11 +177,13 @@ H5S_select_release (H5S_t *space) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -herr_t H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op, hssize_t *start, - hssize_t *_stride, hssize_t *count, hssize_t *_block) +herr_t +H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op, + const hssize_t *start, const hsize_t *_stride, const hsize_t *count, + const hsize_t *_block) { H5S_t *space = NULL; /* Dataspace to modify selection of */ - hssize_t *stride, /* Stride array */ + hsize_t *stride, /* Stride array */ *block; /* Block size array */ uintn contig; /* whether selection is contiguous or not */ int i; /* Counters */ @@ -211,7 +213,7 @@ herr_t H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op, hssize_t *start, "can't allocate stride vector"); H5V_array_fill(stride,&fill,sizeof(hssize_t),space->extent.u.simple.rank); } else { - stride=_stride; + stride=(hsize_t *)_stride; } /* end else */ /* Fill in the correct block values */ @@ -223,7 +225,7 @@ herr_t H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op, hssize_t *start, "can't allocate stride vector"); H5V_array_fill(block,&fill,sizeof(hssize_t),space->extent.u.simple.rank); } else { - block=_block; + block=(hsize_t *)_block; } /* end else */ /* Check for overlapping blocks (remove when real block-merging algorithm is in place) */ |