diff options
| author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2005-02-25 21:43:03 (GMT) |
|---|---|---|
| committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2005-02-25 21:43:03 (GMT) |
| commit | a5b452c417ce55b6f00725b29a26183eb5562ecc (patch) | |
| tree | 8b771272cfeae39b5f0336af69ebf476a1fd1ad9 /hl/src | |
| parent | 82ae8ac4e0ec0929e432c99361e68f5f60cb5553 (diff) | |
| download | hdf5-a5b452c417ce55b6f00725b29a26183eb5562ecc.zip hdf5-a5b452c417ce55b6f00725b29a26183eb5562ecc.tar.gz hdf5-a5b452c417ce55b6f00725b29a26183eb5562ecc.tar.bz2 | |
[svn-r10090] Purpose:
change
Description:
Minor changes to Dimension Scale API, to bring into alignment
with specification.
Solution:
Platforms tested:
verbena,shanti, copper64
Misc. update:
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/H5DS.c | 18 | ||||
| -rw-r--r-- | hl/src/H5DS.h | 7 |
2 files changed, 12 insertions, 13 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index a9a93e1..66cb7b4 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -885,7 +885,7 @@ out: } /*------------------------------------------------------------------------- - * Function: H5DSget_nscales + * Function: H5DSget_num_scales * * Purpose: get the number of scales linked to the IDX dimension of DNAME * @@ -904,9 +904,8 @@ out: *------------------------------------------------------------------------- */ -herr_t H5DSget_nscales(hid_t did, - unsigned int dim, - int *nscales) +int H5DSget_num_scales(hid_t did, + unsigned int dim) { int has_dimlist; hid_t sid; /* space ID */ @@ -915,6 +914,7 @@ herr_t H5DSget_nscales(hid_t did, int rank; /* rank of dataset */ hvl_t *buf; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ + int nscales; /*------------------------------------------------------------------------- * parameter checking @@ -979,7 +979,7 @@ herr_t H5DSget_nscales(hid_t did, if (H5Aread(aid,tid,buf)<0) goto out; - *nscales=(int)buf[dim].len; + nscales=(int)buf[dim].len; /* close */ if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf)<0) @@ -995,7 +995,7 @@ herr_t H5DSget_nscales(hid_t did, } /* has_dimlist */ - return SUCCESS; + return nscales; /* error zone, gracefully close */ out: @@ -1459,12 +1459,12 @@ out: *------------------------------------------------------------------------- */ -herr_t H5DSis_scale(hid_t did) +htri_t H5DSis_scale(hid_t did) { hid_t tid; /* attribute type ID */ hid_t aid; /* attribute ID */ herr_t has_class; /* has the "CLASS" attribute */ - herr_t is_ds; /* boolean return value */ + htri_t is_ds; /* boolean return value */ H5I_type_t it; /* ID type */ char buf[20]; @@ -1598,7 +1598,7 @@ herr_t H5DSiterate_scales(hid_t did, return FAIL; /* get the number of scales assotiated with this DIM */ - if (H5DSget_nscales(did,dim,&nscales)<0) + if ((nscales = H5DSget_num_scales(did,dim))<0) goto out; /* get dataset space */ diff --git a/hl/src/H5DS.h b/hl/src/H5DS.h index 327f602..48e2365 100644 --- a/hl/src/H5DS.h +++ b/hl/src/H5DS.h @@ -51,9 +51,8 @@ herr_t H5DSdetach_scale(hid_t did, herr_t H5DSset_scale(hid_t dsid, char *dimname); -herr_t H5DSget_nscales(hid_t did, - unsigned int dim, - int *nscales); +int H5DSget_num_scales(hid_t did, + unsigned int dim); herr_t H5DSset_label(hid_t did, unsigned int idx, @@ -68,7 +67,7 @@ ssize_t H5DSget_scale_name(hid_t did, char *name, size_t size); -herr_t H5DSis_scale(hid_t did); +htri_t H5DSis_scale(hid_t did); herr_t H5DSiterate_scales(hid_t did, unsigned int dim, |