diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2000-12-13 02:15:31 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2000-12-13 02:15:31 (GMT) |
commit | 9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066 (patch) | |
tree | bdabb7f53c51b873b76b0d55e4548af592fb357d /c++/src/H5File.cpp | |
parent | b72e8ae6b9d9476e8060a9a8f0e0c8058db2591b (diff) | |
download | hdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.zip hdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.tar.gz hdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.tar.bz2 |
[svn-r3121] Purpose:
Fix and improve
Description:
- Put functions that are common to H5File and Group into a
prototype class, CommonFG. I didn't do that before because
of the fear of the consequences of multiple inheritance, since
H5File and Group already inherit from different super classes.
I recently read a C++ book and learned to use MI more safely.
This change reduced some more of code redundancy.
- Added missing const to some function parameters
- Added missing return statements for some functions.
Platforms tested:
Solaris/CC 5.0 (arabica)
Diffstat (limited to 'c++/src/H5File.cpp')
-rw-r--r-- | c++/src/H5File.cpp | 328 |
1 files changed, 14 insertions, 314 deletions
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp index 1ccea96..0498174 100644 --- a/c++/src/H5File.cpp +++ b/c++/src/H5File.cpp @@ -11,13 +11,13 @@ #include "H5FcreatProp.h" #include "H5DxferProp.h" #include "H5DcreatProp.h" +#include "H5CommonFG.h" #include "H5Group.h" #include "H5AbstractDs.h" #include "H5DataSpace.h" #include "H5DataSet.h" #include "H5File.h" #include "H5Alltypes.h" -#include "H5CommonFG.h" #ifndef H5_NO_NAMESPACE namespace H5 { @@ -83,6 +83,13 @@ bool H5File::isHdf5(const char* name ) } } +// Get id of the location, which id the file id here; used by CommonFG +// member functions +hid_t H5File::getLocId() const +{ + return( getId() ); +} + // Reopens this file void H5File::reopen() { @@ -99,172 +106,6 @@ void H5File::reopen() } } -// Creates a new group in this file using the template function provided -// in FGtemplates.h -Group H5File::createGroup( const string& name, size_t size_hint ) const -{ - return( createGroup( name.c_str(), size_hint )); -} - -Group H5File::createGroup( const char* name, size_t size_hint ) const -{ - try { - Group group = createGroupT( id, name, size_hint ); - return( group ); - } - catch( File_GroupException error ) - { - throw FileIException(); - } -} - -// Opens an existing group in this file using the template function provided -// in FGtemplates.h -Group H5File::openGroup( const string& name ) const -{ - return( openGroup( name.c_str() )); -} - -Group H5File::openGroup( const char* name ) const -{ - try { - Group group = openGroupT( id, name ); - return( group ); - } - catch( File_GroupException error ) - { - throw FileIException(); - } -} - -// Creates a dataset in this file using the template function -// provided in FGtemplates.h -DataSet H5File::createDataSet( const string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const -{ - return( createDataSet( name.c_str(), data_type, data_space, create_plist )); -} - -DataSet H5File::createDataSet( const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const -{ - try { - DataSet dataset = createDataSetT( id, name, data_type, data_space, create_plist ); - return( dataset ); - } - catch( File_GroupException error ) - { - throw FileIException(); - } -} - -// Opens an existing dataset in this file using the template function -// provided in FGtemplates.h -DataSet H5File::openDataSet( const string& name ) const -{ - return( openDataSet( name.c_str() )); -} - -DataSet H5File::openDataSet( const char* name ) const -{ - try { - DataSet dataset = openDataSetT( id, name ); - return( dataset ); - } - catch( File_GroupException error ) - { - throw FileIException(); - } -} - -// This private member function calls the C API H5Topen to open the -// named datatype in this file, and returns the datatype's identifier. -// The function is used by the functions openXxxType's below for -// opening the sub-types -hid_t H5File::p_openDataType( const char* name ) const -{ - // Call C function H5Topen to open the named datatype in this group, - // giving the group id - hid_t datatype_id = H5Topen( id, name ); - - // If the datatype id is valid, return it, otherwise, throw an exception. - if( datatype_id > 0 ) - return( datatype_id ); - else - { - throw FileIException(); - } -} - -// -// The following member functions use the private function -// p_openDataType to open a named datatype in this group -// - -// Opens the named generic datatype in this group. -DataType H5File::openDataType( const string& name ) const -{ - return( openDataType( name.c_str()) ); -} -DataType H5File::openDataType( const char* name ) const -{ - DataType data_type( p_openDataType( name )); - return( data_type ); -} - -// Opens the named enumeration datatype in this group. -EnumType H5File::openEnumType( const string& name ) const -{ - return( openEnumType( name.c_str()) ); -} -EnumType H5File::openEnumType( const char* name ) const -{ - EnumType enum_type( p_openDataType( name )); - return( enum_type ); -} - -// Opens the named compound datatype in this group. -CompType H5File::openCompType( const string& name ) const -{ - return( openCompType( name.c_str()) ); -} -CompType H5File::openCompType( const char* name ) const -{ - CompType comp_type( p_openDataType( name )); - return( comp_type ); -} - -// Opens the named integer datatype in this group. -IntType H5File::openIntType( const string& name ) const -{ - return( openIntType( name.c_str()) ); -} -IntType H5File::openIntType( const char* name ) const -{ - IntType int_type( p_openDataType( name )); - return( int_type ); -} - -// Opens the named floating-point datatype in this group. -FloatType H5File::openFloatType( const string& name ) const -{ - return( openFloatType( name.c_str()) ); -} -FloatType H5File::openFloatType( const char* name ) const -{ - FloatType float_type( p_openDataType( name )); - return( float_type ); -} - -// Opens the named string datatype of this group -StrType H5File::openStrType( const string& name ) const -{ - return( openStrType( name.c_str()) ); -} -StrType H5File::openStrType( const char* name ) const -{ - StrType str_type( p_openDataType( name )); - return( str_type ); -} - // Returns the creation property list of this file FileCreatPropList H5File::getCreatePlist() const { @@ -301,153 +142,6 @@ FileAccPropList H5File::getAccessPlist() const } } -// Creates a link of the specified type from new_name to current_name; -// both names are interpreted relative to this file -void H5File::link( H5G_link_t link_type, const string& curr_name, const string& new_name ) const -{ - link( link_type, curr_name.c_str(), new_name.c_str() ); -} - -void H5File::link( H5G_link_t link_type, const char* curr_name, const char* new_name ) const -{ - try { - linkT( id, link_type, curr_name, new_name ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Removes the specified name from this file. -void H5File::unlink( const string& name ) const -{ - unlink( name.c_str()); -} - -void H5File::unlink( const char* name ) const -{ - try { - unlinkT( id, name ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Renames an object from this file. -void H5File::move( const string& src, const string& dst ) const -{ - move( src.c_str(), dst.c_str()); -} - -void H5File::move( const char* src, const char* dst ) const -{ - try { - moveT( id, src, dst ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Returns information about an object -void H5File::getObjinfo( const string& name, hbool_t follow_link, H5G_stat_t& statbuf ) const -{ - getObjinfo( name, follow_link, statbuf ); -} - -void H5File::getObjinfo( const char* name, hbool_t follow_link, H5G_stat_t& statbuf ) const -{ - try { - getObjinfoT( id, name, follow_link, statbuf ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Returns the name of the object that the symbolic link points to. -string H5File::getLinkval( const string& name, size_t size ) const -{ - return( getLinkval( name.c_str(), size )); -} - -string H5File::getLinkval( const char* name, size_t size ) const -{ - try { - string value = getLinkvalT( id, name, size ); - return( value ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Sets comment for specified object. -void H5File::setComment( const string& name, const string& comment ) const -{ - setComment( name.c_str(), comment.c_str()); -} - -void H5File::setComment( const char* name, const char* comment ) const -{ - try { - setCommentT( id, name, comment ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Retrieves comment for specified object -string H5File::getComment( const string& name, size_t bufsize ) const -{ - return( getComment( name.c_str(), bufsize )); -} - -string H5File::getComment( const char* name, size_t bufsize ) const -{ - try { - string comment = getCommentT( id, name, bufsize ); - return( comment ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Mounts the file 'child' onto this file -void H5File::mount( const string& name, H5File& child, PropList& mount_plist ) const -{ - mount( name.c_str(), child, mount_plist ); -} - -void H5File::mount( const char* name, H5File& child, PropList& mount_plist ) const -{ - try { - mountT( id, name, child.getId(), mount_plist ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - -// Unmounts the file named 'name' from this parent file -void H5File::unmount( const string& name ) const -{ - unmount( name.c_str() ); -} - -void H5File::unmount( const char* name ) const -{ - try { - unmountT( id, name ); - } - catch( File_GroupException error ) { - throw FileIException(); - } -} - // Calls the C API H5Fclose to close this file. Used by IdComponent::reset void H5File::p_close() const { @@ -458,6 +152,12 @@ void H5File::p_close() const } } +// Throw file exception +void H5File::throwException() const +{ + throw FileIException(); +} + // The destructor of this instance calls IdComponent::reset to // reset its identifier - no longer true // Older compilers (baldric) don't support template member functions |