summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1998-10-26 17:42:48 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1998-10-26 17:42:48 (GMT)
commit91fa38993526b45ad2e0da2f8a24548bac21d832 (patch)
tree5c1b8d0153faf4bfcec36280872acc8ef71d6eaf
parentbda4c6c94e77a5ff0aceb7117c90e371505ba233 (diff)
downloadhdf5-91fa38993526b45ad2e0da2f8a24548bac21d832.zip
hdf5-91fa38993526b45ad2e0da2f8a24548bac21d832.tar.gz
hdf5-91fa38993526b45ad2e0da2f8a24548bac21d832.tar.bz2
[svn-r793] Changed return value for H5Sget_select_npoints to hssize_t to enable negative
return values.
-rw-r--r--src/H5A.c2
-rw-r--r--src/H5D.c6
-rw-r--r--src/H5Sprivate.h2
-rw-r--r--src/H5Spublic.h2
-rw-r--r--src/H5Sselect.c10
5 files changed, 11 insertions, 11 deletions
diff --git a/src/H5A.c b/src/H5A.c
index a98e642..ebbe5e7 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -1008,7 +1008,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
{
H5A_t *attr = NULL;
size_t copy_len=0;
- size_t ret_value = FAIL;
+ hssize_t ret_value = FAIL;
FUNC_ENTER(H5Aget_name, FAIL);
H5TRACE3("z","izs",attr_id,buf_size,buf);
diff --git a/src/H5D.c b/src/H5D.c
index 67298f1..2c24479 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1407,7 +1407,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, const H5D_xfer_t *xfer_parms,
void *buf/*out*/)
{
- hsize_t nelmts; /*number of elements */
+ hssize_t nelmts; /*number of elements */
size_t smine_start; /*strip mine start loc */
size_t n, smine_nelmts; /*elements per strip */
hid_t tconv_id=FAIL, bkg_id=FAIL; /* Conversion buffer IDs */
@@ -1768,7 +1768,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, const H5D_xfer_t *xfer_parms,
const void *buf)
{
- hsize_t nelmts; /*total number of elmts */
+ hssize_t nelmts; /*total number of elmts */
size_t smine_start; /*strip mine start loc */
size_t n, smine_nelmts; /*elements per strip */
hid_t tconv_id=FAIL, bkg_id=FAIL; /* Conversion buffer IDs */
@@ -2310,7 +2310,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
{
intn ndims;
hsize_t dim[H5O_LAYOUT_NDIMS];
- hsize_t npoints, ptsperbuf;
+ hssize_t npoints, ptsperbuf;
size_t size, bufsize=8*1024;
hid_t buf_id = -1;
haddr_t addr;
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index c434690..550b8a7 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -316,7 +316,7 @@ herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src);
herr_t H5S_extent_release (H5S_t *space);
herr_t H5S_select_release (H5S_t *space);
herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter);
-hsize_t H5S_get_select_npoints (const H5S_t *space);
+hssize_t H5S_get_select_npoints (const H5S_t *space);
intn H5S_extend (H5S_t *space, const hsize_t *size);
herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims,
const hsize_t *max);
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index f89409e..3b6f636 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -61,7 +61,7 @@ int H5Sget_simple_extent_ndims (hid_t space_id);
int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
hbool_t H5Sis_simple (hid_t space_id);
herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims);
-hsize_t H5Sget_select_npoints (hid_t spaceid);
+hssize_t H5Sget_select_npoints (hid_t spaceid);
herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[], const hsize_t _stride[],
const hsize_t count[], const hsize_t _block[]);
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index e770d3a..7bc4d19 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -708,7 +708,7 @@ done:
PURPOSE
Get the number of elements in current selection
USAGE
- hsize_t H5Sget_select_npoints(dsid)
+ hssize_t H5Sget_select_npoints(dsid)
hid_t dsid; IN: Dataspace ID of selection to query
RETURNS
The number of elements in selection on success, 0 on failure
@@ -719,11 +719,11 @@ done:
EXAMPLES
REVISION LOG
--------------------------------------------------------------------------*/
-hsize_t
+hssize_t
H5Sget_select_npoints(hid_t spaceid)
{
H5S_t *space = NULL; /* Dataspace to modify selection of */
- hsize_t ret_value=0; /* return value */
+ hssize_t ret_value=FAIL; /* return value */
FUNC_ENTER (H5Sget_select_npoints, 0);
H5TRACE1("h","i",spaceid);
@@ -756,10 +756,10 @@ H5Sget_select_npoints(hid_t spaceid)
EXAMPLES
REVISION LOG
--------------------------------------------------------------------------*/
-hsize_t
+hssize_t
H5S_get_select_npoints (const H5S_t *space)
{
- hsize_t ret_value=FAIL; /* return value */
+ hssize_t ret_value=FAIL; /* return value */
FUNC_ENTER (H5S_get_select_npoints, FAIL);