Author: aschnell
Date: Wed Nov 12 20:27:02 2008
New Revision: 53247
URL: http://svn.opensuse.org/viewcvs/yast?rev=53247&view=rev
Log:
- converted some log calls
Modified:
trunk/storage/libstorage/src/EtcRaidtab.cc
trunk/storage/libstorage/src/Nfs.cc
trunk/storage/libstorage/src/NfsCo.cc
Modified: trunk/storage/libstorage/src/EtcRaidtab.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidtab.cc?rev=53247&r1=53246&r2=53247&view=diff
==============================================================================
--- trunk/storage/libstorage/src/EtcRaidtab.cc (original)
+++ trunk/storage/libstorage/src/EtcRaidtab.cc Wed Nov 12 20:27:02 2008
@@ -31,7 +31,7 @@
EtcRaidtab::updateEntry( unsigned num, const list<string>& entries,
const string& mline, const list<string>& devs )
{
- y2milestone( "num:%u", num );
+ y2mil("num:" <::iterator i = mtab.find( num );
if( i != mtab.end() )
Modified: trunk/storage/libstorage/src/Nfs.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Nfs.cc?rev=53247&r1=53246&r2=53247&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Nfs.cc (original)
+++ trunk/storage/libstorage/src/Nfs.cc Wed Nov 12 20:27:02 2008
@@ -19,9 +19,9 @@
Nfs::Nfs( const NfsCo& d, const string& NfsDev ) :
Volume( d, 0, 0 )
{
- y2debug( "constructed nfs dev:%s", NfsDev.c_str() );
+ y2deb("constructed nfs dev:" << NfsDev);
if( d.type() != NFSC )
- y2error( "constructed nfs with wrong container" );
+ y2err("constructed nfs with wrong container");
dev = canonicalName(NfsDev);
if( dev != NfsDev )
alt_names.push_back( NfsDev );
@@ -30,7 +30,7 @@
Nfs::~Nfs()
{
- y2debug( "destructed nfs %s", dev.c_str() );
+ y2deb("destructed nfs " << dev);
}
string Nfs::removeText( bool doing ) const
@@ -100,14 +100,13 @@
Nfs& Nfs::operator= ( const Nfs& rhs )
{
- y2debug( "operator= from %s", rhs.nm.c_str() );
+ y2deb("operator= from " << rhs.nm);
*((Volume*)this) = rhs;
return( *this );
}
Nfs::Nfs( const NfsCo& d, const Nfs& rhs ) : Volume(d)
{
- y2debug( "constructed nfs by copy constructor from %s", rhs.nm.c_str() );
+ y2deb("constructed nfs by copy constructor from " << rhs.nm);
*this = rhs;
}
-
Modified: trunk/storage/libstorage/src/NfsCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.cc?rev=53247&r1=53246&r2=53247&view=diff
==============================================================================
--- trunk/storage/libstorage/src/NfsCo.cc (original)
+++ trunk/storage/libstorage/src/NfsCo.cc Wed Nov 12 20:27:02 2008
@@ -18,7 +18,7 @@
NfsCo::NfsCo( Storage * const s, ProcMounts& mounts ) :
Container(s,"nfs",staticType())
{
- y2debug( "constructing NfsCo detect" );
+ y2deb("constructing NfsCo detect");
init();
getNfsData( mounts );
}
@@ -26,20 +26,20 @@
NfsCo::NfsCo( Storage * const s ) :
Container(s,"nfs",staticType())
{
- y2debug( "constructing NfsCo" );
+ y2deb("constructing NfsCo");
init();
}
NfsCo::NfsCo( Storage * const s, const string& file ) :
Container(s,"nfs",staticType())
{
- y2debug( "constructing NfsCo file:%s", file.c_str() );
+ y2deb("constructing NfsCo file:" << file);
init();
}
NfsCo::~NfsCo()
{
- y2debug( "destructed NfsCo" );
+ y2deb("destructed NfsCo");
}
void
@@ -93,8 +93,7 @@
{
getStorage()->showInfoCb( p->removeText(true) );
}
- y2milestone( "doRemove container %s name %s", name().c_str(),
- p->name().c_str() );
+ y2mil("doRemove container: " << name() << " name:" << p->name());
ret = v->prepareRemove();
if( ret==0 )
{
@@ -284,7 +283,7 @@
NfsCo::NfsCo( const NfsCo& rhs ) : Container(rhs)
{
- y2debug( "constructed NfsCo by copy constructor from %s", rhs.nm.c_str() );
+ y2deb("constructed NfsCo by copy constructor from " << rhs.nm);
*this = rhs;
ConstNfsPair p = rhs.nfsPair();
for( ConstNfsIter i=p.begin(); i!=p.end(); ++i )
@@ -293,5 +292,3 @@
vols.push_back( p );
}
}
-
-
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
