[zypp-commit] r6918 - in /trunk/libzypp/zypp/parser/susetags: PackagesFileReader.cc PackagesFileReader.h

Author: mlandres Date: Tue Aug 28 11:08:34 2007 New Revision: 6918 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6918&view=rev Log: Hide private data in implementation class. Avoid duplicate package filtering code. Modified: trunk/libzypp/zypp/parser/susetags/PackagesFileReader.cc trunk/libzypp/zypp/parser/susetags/PackagesFileReader.h Modified: trunk/libzypp/zypp/parser/susetags/PackagesFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/PackagesFileReader.cc?rev=6918&r1=6917&r2=6918&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/susetags/PackagesFileReader.cc (original) +++ trunk/libzypp/zypp/parser/susetags/PackagesFileReader.cc Tue Aug 28 11:08:34 2007 @@ -40,6 +40,7 @@ public: Impl( const PackagesFileReader & parent_r ) : BaseImpl( parent_r ) + , _sysarch( ZConfig::instance().systemArchitecture() ) {} virtual ~Impl() @@ -57,7 +58,13 @@ ret.swap( _pkgData ); _srcpkgData = 0; _data = 0; - return ret; + // Filter unwanted stuff + if ( ret + && ! ret->arch.compatibleWith( _sysarch ) ) + { + return 0; + } + return ret; } data::SrcPackage_Ptr handoutSourcepackage() @@ -298,6 +305,7 @@ data::Packagebase_Ptr _data; data::Package_Ptr _pkgData; data::SrcPackage_Ptr _srcpkgData; + Arch _sysarch; }; /////////////////////////////////////////////////////////////////// @@ -313,7 +321,6 @@ // METHOD TYPE : Ctor // PackagesFileReader::PackagesFileReader() - : _sysarch( ZConfig::instance().systemArchitecture() ) {} /////////////////////////////////////////////////////////////////// @@ -352,7 +359,7 @@ if ( _pkgConsumer ) { data::Package_Ptr ptr = _pimpl->handoutPackage(); - if (ptr && ptr->arch.compatibleWith( _sysarch )) + if ( ptr ) _pkgConsumer( ptr ); } } @@ -414,8 +421,8 @@ if ( _pkgConsumer ) { data::Package_Ptr ptr = _pimpl->handoutPackage(); - if (ptr && ptr->arch.compatibleWith( _sysarch )) - _pkgConsumer( ptr ); + if ( ptr ) + _pkgConsumer( ptr ); } } else if ( _pimpl->hasSourcepackage() ) Modified: trunk/libzypp/zypp/parser/susetags/PackagesFileReader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/PackagesFileReader.h?rev=6918&r1=6917&r2=6918&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/susetags/PackagesFileReader.h (original) +++ trunk/libzypp/zypp/parser/susetags/PackagesFileReader.h Tue Aug 28 11:08:34 2007 @@ -45,8 +45,6 @@ /** */ class PackagesFileReader : public FileReaderBase { - private: - Arch _sysarch; public: typedef function PkgConsumer; typedef function SrcPkgConsumer; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org