summaryrefslogtreecommitdiffstats
path: root/testpar/t_mdset.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-04 19:29:58 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-04 19:29:58 (GMT)
commitbb3afd50c2e94cf2db558218c6704dcc285c72e9 (patch)
treeadd60605c7c88c64582acde6b3e84051f72ea27b /testpar/t_mdset.c
parent3db40827da29243b88ade3c3f174f3f5e6cd0622 (diff)
downloadhdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.zip
hdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.tar.gz
hdf5-bb3afd50c2e94cf2db558218c6704dcc285c72e9.tar.bz2
[svn-r14185] Description:
Move H5Aopen_name() routine to deprecated symbol section and replace internal usage with H5Aopen(). Add simple regression test for H5Aopen_name() to deprecated routine test. 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 'testpar/t_mdset.c')
-rw-r--r--testpar/t_mdset.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 085fbfc..83421cb 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -380,8 +380,8 @@ void null_dataset(void)
VRFY((uval==2), "H5Dread");
/* Open the attribute for the dataset */
- attr=H5Aopen_name(dataset,attr_name);
- VRFY((attr>=0), "H5Aopen_name");
+ attr = H5Aopen(dataset, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT);
+ VRFY((attr >= 0), "H5Aopen");
/* Try reading from the attribute (make certain our buffer is unmodified) */ ret = H5Aread(attr, H5T_NATIVE_INT, &val);
VRFY((ret>=0), "H5Aread");
@@ -1330,11 +1330,10 @@ int read_attribute(hid_t obj_id, int this_type, int num)
if(this_type == is_group) {
sprintf(attr_name, "Group Attribute %d", num);
- aid = H5Aopen_name(obj_id, attr_name);
+ aid = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT);
if(MAINPROCESS) {
H5Aread(aid, H5T_NATIVE_INT, &in_num);
- vrfy_errors = dataset_vrfy(NULL, NULL, NULL, group_block,
- &in_num, &num);
+ vrfy_errors = dataset_vrfy(NULL, NULL, NULL, group_block, &in_num, &num);
}
H5Aclose(aid);
}
@@ -1342,11 +1341,10 @@ int read_attribute(hid_t obj_id, int this_type, int num)
sprintf(attr_name, "Dataset Attribute %d", num);
for(i=0; i<8; i++)
out_data[i] = i;
- aid = H5Aopen_name(obj_id, attr_name);
+ aid = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT);
if(MAINPROCESS) {
H5Aread(aid, H5T_NATIVE_INT, in_data);
- vrfy_errors = dataset_vrfy(NULL, NULL, NULL, dset_block, in_data,
- out_data);
+ vrfy_errors = dataset_vrfy(NULL, NULL, NULL, dset_block, in_data, out_data);
}
H5Aclose(aid);
}