Author: aschnell Date: Wed Nov 12 22:33:30 2008 New Revision: 53253 URL: http://svn.opensuse.org/viewcvs/yast?rev=53253&view=rev Log: - converted some log calls Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/PeContainer.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.... ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Wed Nov 12 22:33:30 2008 @@ -21,7 +21,7 @@ dev = "/dev/" + nm; size_k = mnr = mjr = 0; typ = t; - y2debug( "constructed cont %s", nm.c_str() ); + y2deb("constructed cont " << nm); } Container::~Container() @@ -30,7 +30,7 @@ { delete( *i ); } - y2debug( "destructed cont %s", dev.c_str() ); + y2deb("destructed cont " << dev); } static bool notDeleted( const Volume& v ) Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?re... ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Wed Nov 12 22:33:30 2008 @@ -25,12 +25,12 @@ Disk(s,Name,SizeK) { fmt = DASDF_NONE; - y2debug( "constructed dasd %s", dev.c_str() ); + y2deb("constructed dasd " << dev); } Dasd::~Dasd() { - y2debug( "destructed dasd %s", dev.c_str() ); + y2deb("destructed dasd " << dev); } bool Dasd::detectPartitionsFdasd( ProcPart& ppart ) @@ -129,7 +129,7 @@ unsigned long StartM, EndM; string PartitionType, TInfo; - y2debug( "Line: %s", Line.c_str() ); + y2deb("Line:" << Line); std::istringstream Data( Line ); classic(Data); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?re... ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Nov 12 22:33:30 2008 @@ -41,7 +41,7 @@ else dev = "/dev/" + Name; size_k = SizeK; - y2debug( "constructed disk %s", dev.c_str() ); + y2deb("constructed disk " << dev); } Disk::Disk( Storage * const s, const string& Name, @@ -161,12 +161,12 @@ Partition *p = new Partition( *this, extractNthWord( 1, line, true )); addToList( p ); } - y2debug( "constructed disk %s from file %s", dev.c_str(), fname.c_str() ); + y2deb("constructed disk " << dev << " from file " << fname); } Disk::~Disk() { - y2debug( "destructed disk %s", dev.c_str() ); + y2deb("destructed disk " << dev); } @@ -615,7 +615,7 @@ unsigned long StartM, EndM; string PartitionType, TInfo; - y2debug( "Line: %s", Line.c_str() ); + y2deb("Line:" << Line); std::istringstream Data( Line ); classic(Data); Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev=... ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Wed Nov 12 22:33:30 2008 @@ -22,7 +22,7 @@ stripe = 1; stripe_size = 0; inactiv = true; - y2debug( "constructed dm dev" ); + y2deb("constructed dm dev"); } Dm::Dm( const PeContainer& d, const string& tn, unsigned mnum ) : @@ -620,7 +620,7 @@ Dm::Dm( const PeContainer& d, const Dm& rhs ) : Volume(d) { - y2debug( "constructed dm by copy constructor from %s", rhs.dev.c_str() ); + y2deb("constructed dm by copy constructor from " << rhs.dev); *this = rhs; } Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?re... ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Wed Nov 12 22:33:30 2008 @@ -19,7 +19,7 @@ DmCo::DmCo( Storage * const s, bool detect, ProcPart& ppart ) : PeContainer(s,staticType()) { - y2debug( "constructing DmCo detect:%d", detect ); + y2deb("constructing DmCo detect:" << detect); init(); if( detect ) getDmData( ppart ); @@ -28,13 +28,13 @@ DmCo::DmCo( Storage * const s, const string& file ) : PeContainer(s,staticType()) { - y2debug( "constructing DmCo file:%s", file.c_str() ); + y2deb("constructing DmCo file:" << file); init(); } DmCo::~DmCo() { - y2debug( "destructed DmCo" ); + y2deb("destructed DmCo"); } void DmCo::updateDmMaps() 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 Nov 12 22:33:30 2008 @@ -21,7 +21,7 @@ ProcPart& ppart ) : PeContainer(s,t) { - y2debug( "constructing DmPart co %s", name.c_str() ); + y2deb("constructing DmPart co " << name); dev = name; nm = undevName(name); num_part = num_pe = free_pe = 0; @@ -37,7 +37,7 @@ delete disk; disk = NULL; } - y2debug( "destructed DmPart co %s", dev.c_str() ); + y2deb("destructed DmPart co " << dev); } int DmPartCo::addNewDev( string& device ) Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?r... ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Wed Nov 12 22:33:30 2008 @@ -350,8 +350,7 @@ LvmLv::LvmLv( const LvmVg& d, const LvmLv& rhs ) : Dm(d,rhs) { - y2debug( "constructed lvm lv by copy constructor from %s", - rhs.dev.c_str() ); + y2deb("constructed lvm lv by copy constructor from " << rhs.dev); *this = rhs; } 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 Nov 12 22:33:30 2008 @@ -22,7 +22,7 @@ PeContainer(s,staticType()) { nm = Name; - y2debug( "constructing lvm vg %s", Name.c_str() ); + y2deb("constructing lvm vg " << Name); init(); if( !Name.empty() ) { @@ -33,7 +33,7 @@ } else { - y2error( "empty name in constructor" ); + y2err("empty name in constructor"); } } @@ -46,7 +46,7 @@ lvm1 = lv1; if( Name.empty() ) { - y2error( "empty name in constructor" ); + y2error("empty name in constructor"); } } @@ -58,7 +58,7 @@ LvmVg::~LvmVg() { - y2debug( "destructed lvm vg %s", dev.c_str() ); + y2deb("destructed lvm vg " << dev); } static bool lvDeleted( const LvmLv& l ) { return( l.deleted() ); } Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev=... ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Wed Nov 12 22:33:30 2008 @@ -162,7 +162,7 @@ Md::~Md() { - y2debug( "destructed md %s", dev.c_str() ); + y2deb("destructed md " << dev); } void @@ -677,7 +677,7 @@ Md::Md( const MdCo& d, const Md& rhs ) : Volume(d) { - y2debug( "constructed md by copy constructor from %s", rhs.dev.c_str() ); + y2deb("constructed md by copy constructor from " << rhs.dev); *this = rhs; } Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?re... ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Nov 12 22:33:30 2008 @@ -19,7 +19,7 @@ MdCo::MdCo( Storage * const s, bool detect ) : Container(s,"md",staticType()) { - y2debug( "constructing MdCo detect:%d", detect ); + y2deb("constructing MdCo detect:" << detect); init(); if( detect ) getMdData(); @@ -28,13 +28,13 @@ MdCo::MdCo( Storage * const s, const string& file ) : Container(s,"md",staticType()) { - y2debug( "constructing MdCo file:%s", file.c_str() ); + y2deb("constructing MdCo file:" << file); init(); } MdCo::~MdCo() { - y2debug( "destructed MdCo" ); + y2deb("destructed MdCo"); delete tab; } Modified: trunk/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.... ============================================================================== --- trunk/storage/libstorage/src/Partition.cc (original) +++ trunk/storage/libstorage/src/Partition.cc Wed Nov 12 22:33:30 2008 @@ -556,7 +556,7 @@ Partition::~Partition() { - y2debug( "destructed partition %s", dev.c_str() ); + y2deb("destructed partition " << dev); } void @@ -669,8 +669,7 @@ Partition::Partition( const Disk& d, const Partition& rhs ) : Volume(d) { - y2debug( "constructed partition by copy constructor from %s", - rhs.dev.c_str() ); + y2deb("constructed partition by copy constructor from " << rhs.dev); *this = rhs; } Modified: trunk/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContaine... ============================================================================== --- trunk/storage/libstorage/src/PeContainer.cc (original) +++ trunk/storage/libstorage/src/PeContainer.cc Wed Nov 12 22:33:30 2008 @@ -16,13 +16,13 @@ PeContainer::PeContainer( Storage * const s, CType t ) : Container(s,"",t) { - y2debug( "constructing pe container type %d", t ); + y2deb("constructing pe container type " << t); init(); } PeContainer::~PeContainer() { - y2debug( "destructed pe container %s", dev.c_str() ); + y2deb("destructed pe container " << dev); } void PeContainer::unuseDev() @@ -751,8 +751,7 @@ PeContainer::PeContainer( const PeContainer& rhs ) : Container(rhs) { - y2debug( "constructed PeContainer by copy constructor from %s", - rhs.nm.c_str() ); + y2deb("constructed PeContainer by copy constructor from " << rhs.nm); *this = rhs; } Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?... ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed Nov 12 22:33:30 2008 @@ -50,12 +50,12 @@ numeric = false; size_k = orig_size_k = 0; init(); - y2debug( "constructed late init volume" ); + y2deb("constructed late init volume"); } Volume::~Volume() { - y2debug( "destructed volume %s", dev.c_str() ); + y2deb("destructed volume " << dev); } void Volume::setNameDev() @@ -3100,7 +3100,7 @@ Volume::Volume( const Volume& rhs ) : cont(rhs.cont) { - y2debug( "constructed vol by copy constructor from %s", rhs.dev.c_str() ); + y2deb("constructed vol by copy constructor from " << rhs.dev); *this = rhs; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org