From: Duncan Mac-Vicar P Date: Fri, 28 Apr 2006 18:14:46 +0000 (+0000) Subject: get rid of autobuild check when throwing exceptions without throw X-Git-Tag: BASE-SuSE-SLE-10-SP2-Branch~895 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ac8d0393d20dfa9a22c2f6838f52719cb46f93a;p=platform%2Fupstream%2Flibzypp.git get rid of autobuild check when throwing exceptions without throw but with a macro, returning a null pointer at the end (never reached). --- diff --git a/zypp/source/yum/YUMSourceImpl.cc b/zypp/source/yum/YUMSourceImpl.cc index ea9c18f..b02e750 100644 --- a/zypp/source/yum/YUMSourceImpl.cc +++ b/zypp/source/yum/YUMSourceImpl.cc @@ -768,6 +768,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create package object")); } + return 0L; } Atom::Ptr YUMSourceImpl::augmentPackage( @@ -888,6 +889,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create augmented package object")); } + return 0L; } Selection::Ptr YUMSourceImpl::createGroup( @@ -913,6 +915,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create package group object")); } + return 0L; } Pattern::Ptr YUMSourceImpl::createPattern( @@ -942,6 +945,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create installation pattern object")); } + return 0L; } Message::Ptr YUMSourceImpl::createMessage( @@ -973,6 +977,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create message object")); } + return 0L; } Script::Ptr YUMSourceImpl::createScript( @@ -1003,6 +1008,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create script object")); } + return 0L; } Product::Ptr YUMSourceImpl::createProduct( @@ -1034,6 +1040,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create product object")); } + return 0L; } Patch::Ptr YUMSourceImpl::createPatch( @@ -1154,6 +1161,7 @@ namespace zypp ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create patch object")); } + return 0L; } Dependencies YUMSourceImpl::createDependencies( diff --git a/zypp/target/store/XMLFilesBackend.cc b/zypp/target/store/XMLFilesBackend.cc index fee21c7..3865823 100644 --- a/zypp/target/store/XMLFilesBackend.cc +++ b/zypp/target/store/XMLFilesBackend.cc @@ -785,6 +785,7 @@ XMLFilesBackend::createPatch( const zypp::parser::xmlstore::XMLPatchData & parse ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create patch object")); } + return 0L; } Atom::Ptr @@ -808,6 +809,7 @@ XMLFilesBackend::createAtom( const zypp::parser::xmlstore::XMLPatchAtomData & pa ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create atom object")); } + return 0L; } Message::Ptr @@ -832,6 +834,7 @@ XMLFilesBackend::createMessage( const zypp::parser::xmlstore::XMLPatchMessageDat ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create message object")); } + return 0L; } Script::Ptr @@ -869,6 +872,7 @@ XMLFilesBackend::createScript(const zypp::parser::xmlstore::XMLPatchScriptData & ERR << excpt_r.what() << endl; ZYPP_THROW(Exception("Cannot create script object")); } + return 0L; } Language::Ptr @@ -883,6 +887,7 @@ XMLFilesBackend::createLanguage( const zypp::parser::xmlstore::XMLLanguageData & ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create language object")); } + return 0L; } @@ -935,6 +940,7 @@ XMLFilesBackend::createProduct( const zypp::parser::xmlstore::XMLProductData & p ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create product object")); } + return 0L; } Pattern::Ptr @@ -966,6 +972,7 @@ XMLFilesBackend::createPattern( const zypp::parser::xmlstore::XMLPatternData & p ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create installation pattern object")); } + return 0L; } Selection::Ptr @@ -996,6 +1003,7 @@ XMLFilesBackend::createSelection( const zypp::parser::xmlstore::XMLPatternData & ZYPP_CAUGHT(excpt_r); ZYPP_THROW(Exception("Cannot create installation selection object")); } + return 0L; } Dependencies