Author: aschnell Date: Tue Nov 3 15:31:36 2009 New Revision: 59278 URL: http://svn.opensuse.org/viewcvs/yast?rev=59278&view=rev Log: - some cleanup Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.h branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.h branches/tmp/mpatelcz/SP1-md/libstorage/src/StorageInterface.h Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdCo.cc Tue Nov 3 15:31:36 2009 @@ -87,13 +87,13 @@ { y2milestone( "begin" ); string line; - string line2; std::ifstream file( "/proc/mdstat" ); classic(file); getline( file, line ); while( file.good() ) { string mdDev = extractNthWord( 0, line ); + string line2; getline(file,line2); if( canHandleDev(mdDev,line2) ) @@ -805,7 +805,7 @@ if( Md::mdStringNum(name,dummy) ) { // if it's not used by Md Part - if(MdPartCo::isHandled(name) == false) + if (!MdPartCo::isHandled(name)) { //Exclude 'container' if( line2.find("external:imsm") == string::npos && Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc Tue Nov 3 15:31:36 2009 @@ -1369,7 +1369,7 @@ (void)info; } -void MdPartCo::getMdProps(void) +void MdPartCo::getMdProps() { y2mil("Called"); @@ -1705,8 +1705,7 @@ } - -void MdPartCo::initMd(void) +void MdPartCo::initMd() { /* Name is 'nm' read all props. */ getMdProps(); @@ -1805,7 +1804,7 @@ } -void MdPartCo::getMajorMinor(void) +void MdPartCo::getMajorMinor() { string path = sysfs_path + nm + "/dev"; @@ -1841,7 +1840,7 @@ } -bool MdPartCo::isMdPlatform(void) +bool MdPartCo::isImsmPlatform() { bool ret = false; SystemCmd c; @@ -2007,7 +2006,7 @@ list<string> MdPartCo::devHandled; -void MdPartCo::logData( const string& Dir ) {;} +void MdPartCo::logData( const string& Dir ) {} } Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.h (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.h Tue Nov 3 15:31:36 2009 @@ -175,9 +175,9 @@ static bool isHandled(const string& name); static void setHandlingDev(bool val) { handlingMd = val; } - static bool isHandlingDev(void) { return handlingMd; } + static bool isHandlingDev() { return handlingMd; } - static bool isMdPlatform(void); + static bool isImsmPlatform(); static bool matchRegex( const string& dev ); static bool mdStringNum( const string& name, unsigned& num ); @@ -353,8 +353,8 @@ bool readProp(enum MdProperty prop, string& val); /* For that RAID type parity means something */ - bool hasParity(void ) - { return (md_type == RAID5 || md_type == RAID6 || md_type == RAID10); } + bool hasParity() const + { return md_type == RAID5 || md_type == RAID6 || md_type == RAID10; } mutable storage::MdPartCoInfo info; bool is_copy; Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc Tue Nov 3 15:31:36 2009 @@ -483,7 +483,7 @@ y2mil("Done"); } -bool Storage::discoverMdPVols(void) +bool Storage::discoverMdPVols() { if( !instsys() ) { @@ -492,7 +492,7 @@ string mdDevs = ""; string partedDevs = ""; string nonFSDevs = ""; - bool ret = MdPartCo::isMdPlatform(); + bool ret = MdPartCo::isImsmPlatform(); if( ret == true ) { y2mil("Intel SW RAID Platform detected."); Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.h (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.h Tue Nov 3 15:31:36 2009 @@ -445,7 +445,7 @@ int getContMdPartCoInfo( const string& name, ContainerInfo& cinfo, MdPartCoInfo& info); int getMdPartCoStateInfo(const string& name, MdPartCoStateInfo& info); - bool useMdForIMSM(void) { return MdPartCo::isHandlingDev(); } + bool useMdForImsm() { return MdPartCo::isHandlingDev(); } int addNfsDevice( const string& nfsDev, const string& opts, unsigned long long sizeK, const string& mp ); Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/StorageInterface.h (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/StorageInterface.h Tue Nov 3 15:31:36 2009 @@ -875,7 +875,7 @@ * @return true if IMSM/ISW SW RAIDa are handled by Md/MdPart classes. * False otherwise. */ - virtual bool useMdForIMSM(void) = 0; + virtual bool useMdForImsm() = 0; /** * Query all volumes found in system -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org