Author: aschnell Date: Wed Feb 25 18:46:36 2009 New Revision: 55762 URL: http://svn.opensuse.org/viewcvs/yast?rev=55762&view=rev Log: - use newer logging functions Modified: trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/LvmVg.cc Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.c... ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Wed Feb 25 18:46:36 2009 @@ -78,8 +78,7 @@ DmPartCo::createPartition( storage::PartitionType type, long unsigned start, long unsigned len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type:" << type << " start:" << start << " len:" << len << " relaxed:" << checkRelaxed); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -94,7 +93,7 @@ int DmPartCo::createPartition( long unsigned len, string& device, bool checkRelaxed ) { - y2milestone( "len %ld relaxed:%d", len, checkRelaxed ); + y2mil("len:" << len << " relaxed:" << checkRelaxed); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -109,7 +108,7 @@ int DmPartCo::createPartition( storage::PartitionType type, string& device ) { - y2milestone( "type %u", type ); + y2mil("type:" << type); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -540,8 +539,7 @@ int DmPartCo::doSetType( DmPart* dm ) { - y2milestone( "doSetType container %s name %s", name().c_str(), - dm->name().c_str() ); + y2mil("doSetType container " << name() << " name " << dm->name()); Partition * p = dm->getPtr(); int ret = p?0:DMPART_PARTITION_NOT_FOUND; if( ret==0 ) @@ -658,7 +656,7 @@ list<Volume*>& vol ) { int ret = 0; - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("col:" << col.size() << " vol:" << vol.size()); getStorage()->logCo( this ); unsigned long oco = col.size(); unsigned long ovo = vol.size(); @@ -673,7 +671,7 @@ if( del_ptable && find( col.begin(), col.end(), this )==col.end() ) col.push_back( this ); if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -745,7 +743,7 @@ int DmPartCo::doCreate( Volume* v ) { - y2milestone( "Raid:%s part:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && l == NULL ) @@ -790,7 +788,7 @@ int DmPartCo::doRemove( Volume* v ) { - y2milestone( "Raid:%s name:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); bool save_act = false; int ret = disk ? 0 : DMPART_INTERNAL_ERR; @@ -833,7 +831,7 @@ int DmPartCo::doResize( Volume* v ) { - y2milestone( "DmPart:%s name:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && l == NULL ) Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?r... ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Feb 25 18:46:36 2009 @@ -225,7 +225,7 @@ LvmVg::setPeSize( long long unsigned peSizeK ) { int ret = 0; - y2milestone( "old:%llu new:%llu", pe_size, peSizeK ); + y2mil("old:" << pe_size << " new:" << peSizeK); if( peSizeK != pe_size ) { unsigned long long old_pe = pe_size; @@ -250,7 +250,7 @@ string& device ) { int ret = 0; - y2milestone( "name:%s sizeK:%llu stripe:%u", name.c_str(), sizeK, stripe ); + y2mil("name:" << name << " sizeK:" << sizeK << " stripe:" << stripe); checkConsistency(); if( readonly() ) { @@ -290,14 +290,14 @@ } if( ret==0 ) checkConsistency(); - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } int LvmVg::resizeVolume( Volume* v, unsigned long long newSize ) { int ret = 0; - y2milestone( "newSizeK:%llu vol:%s", newSize, v->name().c_str() ); + y2mil("newSizeK:" << newSize << " vol:" << v->name()); checkConsistency(); LvmLv * l = dynamic_cast<LvmLv *>(v); @@ -827,7 +827,7 @@ } if( num_lv>0 && lvmLvPair().empty() ) { - y2milestone( "inactive VG %s num_lv:%u", nm.c_str(), num_lv ); + y2mil("inactive VG " << nm << " num_lv:" << num_lv); inactiv = true; } } @@ -923,7 +923,7 @@ } } if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org