forked from boostorg/exception
mutable get_error_info support
[SVN r55707]
This commit is contained in:
@ -17,5 +17,5 @@ file_read( FILE * f, void * buffer, size_t size )
|
||||
{
|
||||
if( size!=fread(buffer,1,size,f) )
|
||||
throw boost::enable_current_exception(file_read_error()) <<
|
||||
boost::errinfo_errno(errno);
|
||||
boost::errinfo_errno(errno);
|
||||
}
|
||||
|
@ -27,27 +27,27 @@ struct file_read_error: virtual file_error { };
|
||||
|
||||
boost::shared_ptr<FILE>
|
||||
open_file( char const * file, char const * mode )
|
||||
{
|
||||
if( FILE * f=fopen(file,mode) )
|
||||
return boost::shared_ptr<FILE>(f,fclose);
|
||||
else
|
||||
BOOST_THROW_EXCEPTION(
|
||||
file_open_error() <<
|
||||
boost::errinfo_api_function("fopen") <<
|
||||
boost::errinfo_errno(errno) <<
|
||||
boost::errinfo_file_name(file) <<
|
||||
boost::errinfo_file_open_mode(mode) );
|
||||
}
|
||||
{
|
||||
if( FILE * f=fopen(file,mode) )
|
||||
return boost::shared_ptr<FILE>(f,fclose);
|
||||
else
|
||||
BOOST_THROW_EXCEPTION(
|
||||
file_open_error() <<
|
||||
boost::errinfo_api_function("fopen") <<
|
||||
boost::errinfo_errno(errno) <<
|
||||
boost::errinfo_file_name(file) <<
|
||||
boost::errinfo_file_open_mode(mode) );
|
||||
}
|
||||
|
||||
size_t
|
||||
read_file( boost::shared_ptr<FILE> const & f, void * buf, size_t size )
|
||||
{
|
||||
size_t nr=fread(buf,1,size,f.get());
|
||||
if( ferror(f.get()) )
|
||||
BOOST_THROW_EXCEPTION(
|
||||
file_read_error() <<
|
||||
boost::errinfo_api_function("fread") <<
|
||||
boost::errinfo_errno(errno) <<
|
||||
boost::errinfo_file_handle(f) );
|
||||
return nr;
|
||||
}
|
||||
{
|
||||
size_t nr=fread(buf,1,size,f.get());
|
||||
if( ferror(f.get()) )
|
||||
BOOST_THROW_EXCEPTION(
|
||||
file_read_error() <<
|
||||
boost::errinfo_api_function("fread") <<
|
||||
boost::errinfo_errno(errno) <<
|
||||
boost::errinfo_file_handle(f) );
|
||||
return nr;
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ void
|
||||
file_read( FILE * f, void * buffer, size_t size )
|
||||
{
|
||||
if( size!=fread(buffer,1,size,f) )
|
||||
throw file_read_error() << boost::errinfo_errno(errno);
|
||||
throw file_read_error() << boost::errinfo_errno(errno);
|
||||
}
|
||||
|
||||
//
|
||||
@ -39,7 +39,7 @@ parse_file( char const * file_name )
|
||||
catch(
|
||||
boost::exception & e )
|
||||
{
|
||||
e << boost::errinfo_file_name(file_name);
|
||||
e << boost::errinfo_file_name(file_name);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
@ -61,10 +61,10 @@ my_fopen( char const * name, char const * mode )
|
||||
return boost::shared_ptr<FILE>(f,fclose);
|
||||
else
|
||||
BOOST_THROW_EXCEPTION(fopen_error() <<
|
||||
boost::errinfo_errno (errno) <<
|
||||
boost::errinfo_file_name(name) <<
|
||||
boost::errinfo_file_open_mode(mode) <<
|
||||
boost::errinfo_api_function("fopen"));
|
||||
boost::errinfo_errno (errno) <<
|
||||
boost::errinfo_file_name(name) <<
|
||||
boost::errinfo_file_open_mode(mode) <<
|
||||
boost::errinfo_api_function("fopen"));
|
||||
}
|
||||
|
||||
void
|
||||
@ -75,7 +75,7 @@ my_fread( void * buffer, size_t size, size_t count, boost::shared_ptr<FILE> cons
|
||||
BOOST_THROW_EXCEPTION(fread_error() <<
|
||||
boost::errinfo_api_function("fread") <<
|
||||
boost::errinfo_errno(errno) <<
|
||||
boost::errinfo_file_handle(boost::weak_ptr<FILE>(stream)));
|
||||
boost::errinfo_file_handle(boost::weak_ptr<FILE>(stream)));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -26,6 +26,6 @@ file_open( char const * name, char const * mode )
|
||||
return boost::shared_ptr<FILE>(f,fclose);
|
||||
else
|
||||
throw file_open_error() <<
|
||||
boost::errinfo_file_name(name) <<
|
||||
boost::errinfo_file_name(name) <<
|
||||
clib_failure("fopen",errno);
|
||||
}
|
||||
|
Reference in New Issue
Block a user