summaryrefslogtreecommitdiffstats
path: root/src/H5P.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-01-22 16:41:32 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-01-22 16:41:32 (GMT)
commita0ee2c57e934c5ff2269e345238a6ee019f6c294 (patch)
tree08a553617329401737ddff6af60ccd11a13cc6a3 /src/H5P.c
parentfdfb6dfd26410b931b4452f832b5a4aedec283e0 (diff)
downloadhdf5-a0ee2c57e934c5ff2269e345238a6ee019f6c294.zip
hdf5-a0ee2c57e934c5ff2269e345238a6ee019f6c294.tar.gz
hdf5-a0ee2c57e934c5ff2269e345238a6ee019f6c294.tar.bz2
[svn-r164] Changes since 19980122
---------------------- ./src/*.h Fixed indentation where indent(1) screwed up. This isn't by any means the final say, but it's better than it was. ./src/H5A.c ./src/H5Aprivate.h ./src/H5Apublic.h ./src/H5C.c ./src/H5D.c ./src/H5E.c ./src/H5F.c ./src/H5G.c ./src/H5M.c ./src/H5P.c ./src/H5T.c ./src/H5Tconv.c ./src/debug.c ./test/dtypes.c ./test/istore.c ./test/theap.c ./test/tohdr.c ./test/tstab.c Removed some atom functions from the API and made them library-scope. Also changed some names by removing the redundant `atom' from the name and by adding a `_' after the `H5A'.
Diffstat (limited to 'src/H5P.c')
-rw-r--r--src/H5P.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/H5P.c b/src/H5P.c
index 1524bac..b5a76a7 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -50,9 +50,9 @@ H5P_init_interface(void)
FUNC_ENTER(H5P_init_interface, FAIL);
/* Initialize the atom group for the file IDs */
- if ((ret_value = H5Ainit_group(H5_DATASPACE, H5A_DATASPACEID_HASHSIZE,
- H5P_RESERVED_ATOMS,
- (herr_t (*)(void *)) H5P_close)) != FAIL) {
+ if ((ret_value = H5A_init_group(H5_DATASPACE, H5A_DATASPACEID_HASHSIZE,
+ H5P_RESERVED_ATOMS,
+ (herr_t (*)(void *)) H5P_close)) != FAIL) {
ret_value = H5_add_exit(&H5P_term_interface);
}
FUNC_LEAVE(ret_value);
@@ -78,7 +78,7 @@ H5P_init_interface(void)
static void
H5P_term_interface(void)
{
- H5Adestroy_group(H5_DATASPACE);
+ H5A_destroy_group(H5_DATASPACE);
}
/*-------------------------------------------------------------------------
@@ -130,7 +130,7 @@ H5Pcreate(H5P_class_t type)
}
/* Register the new data space and get an ID for it */
- if ((ret_value = H5Aregister_atom(H5_DATASPACE, ds)) < 0) {
+ if ((ret_value = H5A_register(H5_DATASPACE, ds)) < 0) {
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL,
"unable to register data space for ID");
}
@@ -166,8 +166,8 @@ H5Pclose(hid_t space_id)
H5ECLEAR;
/* check args */
- if (H5_DATASPACE != H5Aatom_group(space_id) ||
- NULL == H5Aatom_object(space_id)) {
+ if (H5_DATASPACE != H5A_group(space_id) ||
+ NULL == H5A_object(space_id)) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
/* When the reference count reaches zero the resources are freed */
@@ -318,8 +318,8 @@ H5Pget_npoints(hid_t space_id)
H5ECLEAR;
/* check args */
- if (H5_DATASPACE != H5Aatom_group(space_id) ||
- NULL == (ds = H5Aatom_object(space_id))) {
+ if (H5_DATASPACE != H5A_group(space_id) ||
+ NULL == (ds = H5A_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
}
ret_value = H5P_get_npoints(ds);
@@ -404,8 +404,8 @@ H5Pget_ndims(hid_t space_id)
H5ECLEAR;
/* check args */
- if (H5_DATASPACE != H5Aatom_group(space_id) ||
- NULL == (ds = H5Aatom_object(space_id))) {
+ if (H5_DATASPACE != H5A_group(space_id) ||
+ NULL == (ds = H5A_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
ret_value = H5P_get_ndims(ds);
@@ -491,8 +491,8 @@ H5Pget_dims(hid_t space_id, size_t dims[] /*out */ )
H5ECLEAR;
/* check args */
- if (H5_DATASPACE != H5Aatom_group(space_id) ||
- NULL == (ds = H5Aatom_object(space_id))) {
+ if (H5_DATASPACE != H5A_group(space_id) ||
+ NULL == (ds = H5A_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
if (!dims) {
@@ -772,7 +772,7 @@ H5Pis_simple(hid_t sid)
/* Clear errors and check args and all the boring stuff. */
H5ECLEAR;
- if ((space = H5Aatom_object(sid)) == NULL)
+ if ((space = H5A_object(sid)) == NULL)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a data space");
ret_value = H5P_is_simple(space);
@@ -819,7 +819,7 @@ H5Pset_space(hid_t sid, intn rank, const size_t *dims)
H5ECLEAR;
/* Get the object */
- if ((space = H5Aatom_object(sid)) == NULL)
+ if ((space = H5A_object(sid)) == NULL)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a data space");
if (rank > 0 && dims == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid rank");