diff options
Diffstat (limited to 'tools/lib/h5diff_dset.c')
| -rw-r--r-- | tools/lib/h5diff_dset.c | 45 |
1 files changed, 8 insertions, 37 deletions
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 767587d..0cc8324 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -155,7 +155,6 @@ hsize_t diff_datasetid( hid_t dset1_id, hsize_t storage_size1; hsize_t storage_size2; hsize_t nfound=0; /* number of differences found */ - H5T_class_t type_class; /* data type class */ int cmp=1; /* do diff or not */ int i; @@ -267,25 +266,11 @@ hsize_t diff_datasetid( hid_t dset1_id, * memory type and sizes *------------------------------------------------------------------------- */ - if((type_class = H5Tget_class(f_type1))<0) - goto error; - if(type_class==H5T_BITFIELD) { - if((m_type1=H5Tcopy(f_type1))<0) - goto error; - } else { - if ((m_type1=H5Tget_native_type(f_type1,H5T_DIR_DEFAULT))<0) - goto error; - } + if ((m_type1=h5tools_get_native_type(f_type1))<0) + goto error; - if((type_class = H5Tget_class(f_type2))<0) - goto error; - if(type_class==H5T_BITFIELD) { - if((m_type2=H5Tcopy(f_type2))<0) - goto error; - } else { - if ((m_type2=H5Tget_native_type(f_type2,H5T_DIR_DEFAULT))<0) - goto error; - } + if ((m_type2=h5tools_get_native_type(f_type2))<0) + goto error; m_size1 = H5Tget_size( m_type1 ); m_size2 = H5Tget_size( m_type2 ); @@ -322,15 +307,8 @@ hsize_t diff_datasetid( hid_t dset1_id, { H5Tclose(m_type1); - if((type_class = H5Tget_class(f_type2))<0) - goto error; - if(type_class==H5T_BITFIELD) { - if((m_type1=H5Tcopy(f_type2))<0) - goto error; - } else { - if ((m_type1=H5Tget_native_type(f_type2,H5T_DIR_DEFAULT))<0) - goto error; - } + if ((m_type1=h5tools_get_native_type(f_type2))<0) + goto error; m_size1 = H5Tget_size( m_type1 ); } @@ -338,15 +316,8 @@ hsize_t diff_datasetid( hid_t dset1_id, { H5Tclose(m_type2); - if((type_class = H5Tget_class(f_type1))<0) - goto error; - if(type_class==H5T_BITFIELD) { - if((m_type2=H5Tcopy(f_type1))<0) - goto error; - } else { - if ((m_type2=H5Tget_native_type(f_type1,H5T_DIR_DEFAULT))<0) - goto error; - } + if ((m_type2=h5tools_get_native_type(f_type1))<0) + goto error; m_size2 = H5Tget_size( m_type2 ); } |