summaryrefslogtreecommitdiffstats
path: root/tools/h5dump/h5dump.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-09-27 20:28:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-09-27 20:28:27 (GMT)
commit2c93a80648a72fd19d13c3c014ef998dc1f88f8f (patch)
tree545dda6a2ce07309b440397baa189bb10e70bc3f /tools/h5dump/h5dump.c
parent0ee1ca5c204516f07f71476906218850a67425a3 (diff)
downloadhdf5-2c93a80648a72fd19d13c3c014ef998dc1f88f8f.zip
hdf5-2c93a80648a72fd19d13c3c014ef998dc1f88f8f.tar.gz
hdf5-2c93a80648a72fd19d13c3c014ef998dc1f88f8f.tar.bz2
[svn-r14160] Description:
Make H5Topen versioned, and add regression test for H5Topen1. 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 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'tools/h5dump/h5dump.c')
-rw-r--r--tools/h5dump/h5dump.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 5706837..35e17a2 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1500,7 +1500,7 @@ dump_all(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED *op
break;
case H5O_TYPE_NAMED_DATATYPE:
- if((obj = H5Topen(group, name)) < 0) {
+ if((obj = H5Topen2(group, name, H5P_DEFAULT)) < 0) {
error_msg(progname, "unable to dump datatype \"%s\"\n", name);
d_status = EXIT_FAILURE;
ret = FAIL;
@@ -3232,25 +3232,25 @@ handle_datatypes(hid_t fid, char *type, void UNUSED * data)
{
hid_t type_id;
- if ((type_id = H5Topen(fid, type)) < 0) {
+ if((type_id = H5Topen2(fid, type, H5P_DEFAULT)) < 0) {
/* check if type is unamed datatype */
unsigned idx = 0;
- while (idx < type_table->nobjs ) {
+ while(idx < type_table->nobjs ) {
char name[128];
- if (!type_table->objs[idx].recorded) {
+ if(!type_table->objs[idx].recorded) {
/* unamed datatype */
sprintf(name, "/#"H5_PRINTF_HADDR_FMT, type_table->objs[idx].objno);
- if (!HDstrcmp(name, type))
+ if(!HDstrcmp(name, type))
break;
- }
+ } /* end if */
idx++;
- }
+ } /* end while */
- if (idx == type_table->nobjs) {
+ if(idx == type_table->nobjs) {
/* unknown type */
begin_obj(dump_header_format->datatypebegin, type,
dump_header_format->datatypeblockbegin);
@@ -3269,7 +3269,7 @@ handle_datatypes(hid_t fid, char *type, void UNUSED * data)
} else {
dump_named_datatype(type_id, type);
- if (H5Tclose(type_id) < 0)
+ if(H5Tclose(type_id) < 0)
d_status = EXIT_FAILURE;
}
}