summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1998-07-07 19:10:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1998-07-07 19:10:01 (GMT)
commita67faf317232fc0cc5ea7c4074ae879e51c04636 (patch)
tree3ac9a3a18a64a5ddb4ea284f90932eded8aad5dd
parent27fa4c698f3d07e5e9e7655943526bbdf2b4a2ec (diff)
downloadhdf5-a67faf317232fc0cc5ea7c4074ae879e51c04636.zip
hdf5-a67faf317232fc0cc5ea7c4074ae879e51c04636.tar.gz
hdf5-a67faf317232fc0cc5ea7c4074ae879e51c04636.tar.bz2
[svn-r458] Changed H5Sget_npoints call to H5Sextent_npoints and H5Sselect_npoints calls.
-rw-r--r--src/H5A.c6
-rw-r--r--src/H5Oattr.c2
-rw-r--r--src/H5S.c25
-rw-r--r--src/H5Sall.c2
-rw-r--r--src/H5Sselect.c2
-rw-r--r--src/H5Ssimp.c4
6 files changed, 21 insertions, 20 deletions
diff --git a/src/H5A.c b/src/H5A.c
index 81d6200..0d97803 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -263,7 +263,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
/* Compute the internal sizes */
attr->dt_size=(H5O_DTYPE[0].raw_size)(attr->ent.file,type);
attr->ds_size=(H5O_SDSPACE[0].raw_size)(attr->ent.file,&(space->extent.u.simple));
- attr->data_size=H5S_get_npoints(space)*H5T_get_size(type);
+ attr->data_size=H5S_extent_npoints(space)*H5T_get_size(type);
/* Hold the symbol table entry (and file) open */
if (H5O_open(&(attr->ent)) < 0) {
@@ -668,7 +668,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, void *buf)
assert(buf);
/* Create buffer for data to store on disk */
- nelmts=H5S_get_npoints (attr->ds);
+ nelmts=H5S_extent_npoints (attr->ds);
/* Get the memory and file datatype sizes */
src_type_size = H5T_get_size(mem_type);
@@ -838,7 +838,7 @@ H5A_read(H5A_t *attr, const H5T_t *mem_type, void *buf)
assert(buf);
/* Create buffer for data to store on disk */
- nelmts=H5S_get_npoints (attr->ds);
+ nelmts=H5S_extent_npoints (attr->ds);
/* Get the memory and file datatype sizes */
src_type_size = H5T_get_size(attr->dt);
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index c71318f..5be08b9 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -125,7 +125,7 @@ H5O_attr_decode(H5F_t *f, const uint8 *p, H5O_shared_t __unused__ *sh)
p+=attr->ds_size;
/* Compute the size of the data */
- attr->data_size=H5S_get_npoints(attr->ds)*H5T_get_size(attr->dt);
+ attr->data_size=H5S_extent_npoints(attr->ds)*H5T_get_size(attr->dt);
/* Go get the data */
if (NULL==(attr->data = H5MM_malloc(attr->data_size))) {
diff --git a/src/H5S.c b/src/H5S.c
index 7ebf490..3899ee8 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -427,11 +427,11 @@ H5S_t * H5S_copy(const H5S_t *src)
}
/*-------------------------------------------------------------------------
- * Function: H5Sget_npoints
+ * Function: H5Sextent_npoints
*
- * Purpose: Determines how many data points a data set has.
+ * Purpose: Determines how many data points a dataset extent has.
*
- * Return: Success: Number of data points in the data set.
+ * Return: Success: Number of data points in the dataset.
*
* Failure: 0
*
@@ -439,34 +439,35 @@ H5S_t * H5S_copy(const H5S_t *src)
* Tuesday, December 9, 1997
*
* Modifications:
+ * Changed Name - QAK 7/7/98
*
*-------------------------------------------------------------------------
*/
hsize_t
-H5Sget_npoints (hid_t space_id)
+H5Sextent_npoints (hid_t space_id)
{
H5S_t *ds = NULL;
hsize_t ret_value = 0;
- FUNC_ENTER(H5Sget_npoints, 0);
+ FUNC_ENTER(H5Sextent_npoints, 0);
H5TRACE1("h","i",space_id);
/* Check args */
if (H5_DATASPACE != H5I_group(space_id) || NULL == (ds = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
}
- ret_value = H5S_get_npoints(ds);
+ ret_value = H5S_extent_npoints(ds);
FUNC_LEAVE(ret_value);
}
/*-------------------------------------------------------------------------
- * Function: H5S_get_npoints
+ * Function: H5S_extent_npoints
*
- * Purpose: Determines how many data points a data set has.
+ * Purpose: Determines how many data points a dataset extent has.
*
- * Return: Success: Number of data points in the data set.
+ * Return: Success: Number of data points in the dataset extent.
*
* Failure: 0
*
@@ -474,16 +475,17 @@ H5Sget_npoints (hid_t space_id)
* Tuesday, December 9, 1997
*
* Modifications:
+ * Changed Name - QAK 7/7/98
*
*-------------------------------------------------------------------------
*/
hsize_t
-H5S_get_npoints(const H5S_t *ds)
+H5S_extent_npoints(const H5S_t *ds)
{
hsize_t ret_value = 0;
intn i;
- FUNC_ENTER(H5S_get_npoints, 0);
+ FUNC_ENTER(H5S_extent_npoints, 0);
/* check args */
assert(ds);
@@ -1372,4 +1374,3 @@ done:
}
FUNC_LEAVE(ret_value);
}
-
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 0f9e768..4a3dcce 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -43,7 +43,7 @@ H5S_all_init (const struct H5O_layout_t __unused__ *layout,
assert (sel_iter);
/* Initialize the number of elements to iterate over */
- sel_iter->all.elmt_left=H5S_get_npoints(space);
+ sel_iter->all.elmt_left=H5S_extent_npoints(space);
/* Start at the upper left location */
sel_iter->all.offset=0;
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index cfed797..348b7ce 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -310,7 +310,7 @@ done:
PURPOSE
Get the number of elements in current selection
USAGE
- herr_t H5Sselect_hyperslab(dsid)
+ hsize_t H5Sselect_npoints(dsid)
hid_t dsid; IN: Dataspace ID of selection to query
RETURNS
The number of elements in selection on success, 0 on failure
diff --git a/src/H5Ssimp.c b/src/H5Ssimp.c
index 1f47b45..fda83e1 100644
--- a/src/H5Ssimp.c
+++ b/src/H5Ssimp.c
@@ -72,12 +72,12 @@ H5S_simp_init (const struct H5O_layout_t __unused__ *layout,
*/
f_ndims = H5S_get_hyperslab (file_space, NULL, size, NULL);
if (m_ndims!=f_ndims) {
- nelmts = H5S_get_npoints (file_space);
+ nelmts = H5S_select_npoints (file_space);
if (nelmts>desired_nelmts) {
HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, 0,
"strip mining not supported across dimensionalities");
}
- assert (nelmts==H5S_get_npoints (mem_space));
+ assert (nelmts==H5S_select_npoints (mem_space));
} else {
for (i=f_ndims-1, acc=1; i>0; --i) acc *= size[i];
acc *= (desired_nelmts/acc);