mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r25108] Description:

Browse Source 
- Put back Exception::printError for backward compatibility
    - Added static member function Exception::printErrorStack to print
      error stack without an instance of Exception.
Platforms tested:
    Linux/ppc64 (ostrich)
    Linux/32 2.6 (jam)
    SunOS 5.11 (emu)
This commit is contained in:
Binh-Minh Ribler 2014-04-25 14:47:57 -05:00
parent 01de7491b2
commit 97525f97f2
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
c++/src/H5Exception.cpp
View File

@ -295,16 +295,33 @@ const char* Exception::getCFuncName() const
}
//--------------------------------------------------------------------------
// Function: Exception::printError (static)
// Function: Exception::printErrorStack (static)
///\brief Prints the error stack in a default manner.
///\param stream - IN: File pointer
///\param stream - IN: File pointer, default to stderr
///\param err_stack - IN: Error stack ID, default to H5E_DEFAULT(0)
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void Exception::printError( FILE* stream )
void Exception::printErrorStack(FILE* stream, hid_t err_stack)
{
herr_t ret_value = H5Eprint2( H5E_DEFAULT, stream ); // print to stderr
herr_t ret_value = H5Eprint2(err_stack, stream);
if( ret_value < 0 )
throw Exception( "Exception::printError", "H5Eprint failed" );
throw Exception( "Printing error stack", "H5Eprint2 failed" );
}
//--------------------------------------------------------------------------
// Function: Exception::printError
///\brief Prints the error stack in a default manner. This member
/// function is replaced by the static function printErrorStack
/// and will be removed from the next major release.
///\param stream - IN: File pointer
// Programmer Binh-Minh Ribler - 2000
// Description:
// This function can be removed in next major release.
// -BMR, 2014/04/24
//--------------------------------------------------------------------------
void Exception::printError(FILE* stream) const
{
Exception::printErrorStack(stream, H5E_DEFAULT);
}
//--------------------------------------------------------------------------

4
c++/src/H5Exception.h
View File

@ -72,7 +72,9 @@ class H5_DLLCPP Exception {
H5E_walk2_t func, void* client_data);
// Prints the error stack in a default manner.
static void printError( FILE* stream = NULL );
static void printErrorStack(FILE* stream = stderr,
hid_t err_stack = H5E_DEFAULT); // Static
void printError(FILE* stream = NULL) const;
// Default constructor
Exception();

4
c++/test/trefer.cpp
View File

@ -321,6 +321,10 @@ static void test_reference_obj(void)
H5std_string read_comment1 = group.getComment(".", 10);
verify_val(read_comment1.c_str(), write_comment, "Group::getComment",__LINE__,__FILE__);
// Test with the old default value
read_comment1 = group.getComment(".", 256);
verify_val(read_comment1.c_str(), write_comment, "Group::getComment",__LINE__,__FILE__);
// Test that getComment handles failures gracefully, using
// H5std_string getComment(const char* name, <buf_size=0 by default>)
try {