diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 22:19:07 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 22:19:07 (GMT) |
commit | 1de51c7bc148b9cb5104936dfd23096a222d0cb8 (patch) | |
tree | b23ea23404fd02a41f4539ebbc8311a1c43fecbe /examples | |
parent | 041de441c5d7468812be8af1346b30db6ea94e3a (diff) | |
download | hdf5-1de51c7bc148b9cb5104936dfd23096a222d0cb8.zip hdf5-1de51c7bc148b9cb5104936dfd23096a222d0cb8.tar.gz hdf5-1de51c7bc148b9cb5104936dfd23096a222d0cb8.tar.bz2 |
[svn-r14187] Description:
Put H5Acreate() under API versioning, with all internal usage shifted
to H5Acreate2().
Add regression tests for H5Acreate1().
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Attributes.txt | 14 | ||||
-rw-r--r-- | examples/h5_attribute.c | 8 | ||||
-rw-r--r-- | examples/h5_shared_mesg.c | 5 |
3 files changed, 14 insertions, 13 deletions
diff --git a/examples/Attributes.txt b/examples/Attributes.txt index 69db544..76f2aae 100644 --- a/examples/Attributes.txt +++ b/examples/Attributes.txt @@ -1,6 +1,6 @@ Attribute Examples: -H5Acreate example: Show how to create an attribute for a dataset and a group +H5Acreate2 example: Show how to create an attribute for a dataset and a group ---------------- { hid_t file; @@ -22,15 +22,15 @@ H5Acreate example: Show how to create an attribute for a dataset and a group dataspace = H5Screate_simple(rank, dimsf, NULL); /* Create a dataset */ - dataset=H5Dcreate(file,"Dataset1",H5T_UINT8,dataspace,H5P_DEFAULT); + dataset = H5Dcreate(file, "Dataset1", H5T_UINT8, dataspace, H5P_DEFAULT); <Write data to first dataset> /* Create an attribute for the dataset */ - attr=H5Acreate(dataset,"Attr1",H5T_INT32,H5S_SCALAR,H5P_DEFAULT); + attr = H5Acreate2(dataset, ".", "Attr1", H5T_INT32, H5S_SCALAR, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* Write attribute information */ - H5Awrite(attr,H5T_INT32,&attr_data); + H5Awrite(attr, H5T_INT32, &attr_data); /* Close attribute */ H5Aclose(attr); @@ -39,13 +39,13 @@ H5Acreate example: Show how to create an attribute for a dataset and a group H5Dclose(dataset); /* Create a group */ - group=H5Gcreate2(file, "/Group One", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + group = H5Gcreate2(file, "/Group One", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* Create an attribute for the dataset */ - attr=H5Acreate(group,"Attr1",H5T_INT32,H5S_SCALAR,H5P_DEFAULT); + attr = H5Acreate2(group, ".", "Attr1", H5T_INT32, H5S_SCALAR, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* Write attribute information */ - H5Awrite(attr,H5T_INT32,&attr_data); + H5Awrite(attr, H5T_INT32, &attr_data); /* Close attribute */ H5Aclose(attr); diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c index 3ce72be..1581a88 100644 --- a/examples/h5_attribute.c +++ b/examples/h5_attribute.c @@ -111,7 +111,7 @@ main (void) /* * Create array attribute. */ - attr1 = H5Acreate(dataset, ANAME, H5T_NATIVE_FLOAT, aid1, H5P_DEFAULT); + attr1 = H5Acreate2(dataset, ".", ANAME, H5T_NATIVE_FLOAT, aid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* * Write array attribute. @@ -122,8 +122,8 @@ main (void) * Create scalar attribute. */ aid2 = H5Screate(H5S_SCALAR); - attr2 = H5Acreate(dataset, "Integer attribute", H5T_NATIVE_INT, aid2, - H5P_DEFAULT); + attr2 = H5Acreate2(dataset, ".", "Integer attribute", H5T_NATIVE_INT, aid2, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* * Write scalar attribute. @@ -137,7 +137,7 @@ main (void) atype = H5Tcopy(H5T_C_S1); H5Tset_size(atype, 5); H5Tset_strpad(atype,H5T_STR_NULLTERM); - attr3 = H5Acreate(dataset, ANAMES, atype, aid3, H5P_DEFAULT); + attr3 = H5Acreate2(dataset, ".", ANAMES, atype, aid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); /* * Write string attribute. diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c index 6c9267c..ab79b15 100644 --- a/examples/h5_shared_mesg.c +++ b/examples/h5_shared_mesg.c @@ -288,14 +288,15 @@ create_standard_file(const char *filename, hid_t fcpl_id) /* Begin using the messages many times. Do this by creating datasets * that use this datatype, dataspace, and have this attribute. */ - for(x=0; x<NUM_DATASETS; ++x) { + for(x = 0; x < NUM_DATASETS; ++x) { /* Create a dataset */ dset_id = H5Dcreate(file_id, DSETNAME[x], type_id, space_id, H5P_DEFAULT); if(dset_id < 0) goto error; /* Create an attribute on the dataset */ - attr_id = H5Acreate(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT); + attr_id = H5Acreate2(dset_id, ".", "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if(attr_id < 0) goto error; + /* Write data to the attribute */ ret = H5Awrite(attr_id, H5T_NATIVE_INT, attr_data); if(ret < 0) goto error; |