Author: aschnell Date: Fri Feb 19 14:25:06 2010 New Revision: 60878 URL: http://svn.opensuse.org/viewcvs/yast?rev=60878&view=rev Log: - fixed use of MdPartCo::getContMember Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc?rev=60878&r1=60877&r2=60878&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Fri Feb 19 14:25:06 2010 @@ -2067,19 +2067,22 @@ updateEntry(); } -int MdPartCo::getContMember() + +string +MdPartCo::getContMember() const { - string::size_type pos = md_metadata.find_last_of("/"); - if( pos != string::npos ) - { - unsigned mem; - string tmp = md_metadata; - tmp.erase(0,pos+1); - tmp >> mem; - return mem; + y2mil("md_metadata:" << md_metadata); + string::size_type pos = md_metadata.find_last_of("/"); + if (pos != string::npos) + { + string tmp = md_metadata; + tmp.erase(0, pos + 1); + return tmp; } - return -1; + return string(); } + + void MdPartCo::updateEntry() { EtcRaidtab* tab = getStorage()->getRaidtab(); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h?rev=60878&r1=60877&r2=60878&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Fri Feb 19 14:25:06 2010 @@ -322,8 +322,7 @@ enum mdMap { MAP_DEV=0, MAP_META, MAP_UUID, MAP_NAME, }; static bool findMdMap(std::ifstream& file); - - int getContMember(); + string getContMember() const; //Input: 'mdXXX' device. static storage::CType envSelection(const string& name); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org