From d52c5bf5d9fcc8c3decb9af47428cbab7ef18052 Mon Sep 17 00:00:00 2001 From: "Alexander B. Schmidt" Date: Tue, 6 Nov 2012 21:12:40 +0100 Subject: [PATCH 1/1] refined exceptions. --- configcache.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/configcache.cpp b/configcache.cpp index 556dba7..3a76a55 100644 --- a/configcache.cpp +++ b/configcache.cpp @@ -113,16 +113,6 @@ bool configcache::readConfig() if( !inFile.is_open() ) continue; - std::streampos fsize = inFile.tellg(); - inFile.seekg( 0, std::ios::end ); - fsize = inFile.tellg() - fsize; - if( (int)fsize == 0 ) { - *out->log << "CCACHE: dat-file has zero length! Skipping." << endl << flush; - inFile.close(); - continue; - } - inFile.seekg(0); - inBuffer = new boost::iostreams::filtering_istreambuf; inBuffer->push( boost::iostreams::bzip2_decompressor() ); inBuffer->push(inFile); @@ -132,10 +122,18 @@ bool configcache::readConfig() { int readturn = -1; try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); } + catch(boost::iostreams::bzip2_error& error) { + if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush; + inFile.close(); + } catch (std::exception const& ex) { if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush; inFile.close(); } + catch( ... ) { + if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush; + inFile.close(); + } if( readturn == configSize && inFile.is_open() ) { -- 2.39.5