Mailinglist Archive: yast-commit (939 mails)

[aschnell@xxxxxxxxxxxxxxxx]

Author: aschnell
Date: Thu Nov 13 19:31:25 2008
New Revision: 53300

URL: http://svn.opensuse.org/viewcvs/yast?rev=53300&view=rev
Log:
- converted some log calls

Modified:
    trunk/storage/libstorage/src/Container.cc
    trunk/storage/libstorage/src/LoopCo.cc

Modified: trunk/storage/libstorage/src/Container.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=53300&r1=53299&r2=53300&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Container.cc (original)
+++ trunk/storage/libstorage/src/Container.cc Thu Nov 13 19:31:25 2008
@@ -97,16 +97,15 @@
            break;
        }
     if( col.size()!=oco || vol.size()!=ovo )
-       y2milestone( "ret:%d stage:%d col:%zd vol:%zd", ret, stage,
-                    col.size(), vol.size());
+       y2mil("ret:" << ret << " stage:" << stage << " col:" << col.size() << " 
vol:" <<
+             vol.size());
     return( ret );
     }
 
 int Container::commitChanges( CommitStage stage, Volume* vol )
     {
-    y2milestone( "name:%s stage %d vol:%s", name().c_str(), stage,
-                 vol->name().c_str() );
-    y2mil( "vol:" << *vol );
+    y2mil("name:" << name() << " stage:" << stage << " vol:" << vol->name());
+    y2mil("vol:" << *vol);
     int ret = 0;
     switch( stage )
        {
@@ -149,7 +148,7 @@
 
 int Container::commitChanges( CommitStage stage )
     {
-    y2milestone( "name %s stage %d", name().c_str(), stage );
+    y2mil("name " << name() << " stage " << stage);
     int ret = CONTAINER_INVALID_VIRTUAL_CALL;
     y2mil("ret:" << ret);
     return( ret );
@@ -196,37 +195,33 @@
     }
 
 int Container::doCreate( Volume * v )
-    {
-    y2warning( "invalid Container:%s name:%s", type_names[typ].c_str(),
-               name().c_str() );
+{
+    y2war("invalid container:" << type_names[typ] << " name:" << name());
     return( CONTAINER_INVALID_VIRTUAL_CALL );
-    }
+}
 
 int Container::doRemove( Volume * v )
-    {
-    y2warning( "invalid Container:%s name:%s", type_names[typ].c_str(),
-               name().c_str() );
+{
+    y2war("invalid container:" << type_names[typ] << " name:" << name());
     return( CONTAINER_INVALID_VIRTUAL_CALL );
-    }
+}
 
 int Container::doResize( Volume * v )
-    {
-    y2warning( "invalid Container:%s name:%s", type_names[typ].c_str(),
-               name().c_str() );
+{
+    y2war("invalid container:" << type_names[typ] << " name:" << name());
     return( CONTAINER_INVALID_VIRTUAL_CALL );
-    }
+}
 
 int Container::removeVolume( Volume * v )
-    {
-    y2warning( "invalid Container:%s name:%s", type_names[typ].c_str(),
-               name().c_str() );
+{
+    y2war("invalid container:" << type_names[typ] << " name:" << name());
     return( CONTAINER_INVALID_VIRTUAL_CALL );
-    }
+}
 
 int Container::resizeVolume( Volume * v, unsigned long long )
-    {
+{
     return( VOLUME_RESIZE_UNSUPPORTED_BY_CONTAINER );
-    }
+}
 
 bool Container::removeFromList( Volume* e )
     {

Modified: trunk/storage/libstorage/src/LoopCo.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc?rev=53300&r1=53299&r2=53300&view=diff
==============================================================================
--- trunk/storage/libstorage/src/LoopCo.cc (original)
+++ trunk/storage/libstorage/src/LoopCo.cc Thu Nov 13 19:31:25 2008
@@ -64,12 +64,12 @@
            y2mil( "i:" << *i );
            string lfile = getStorage()->root() + i->device;
            if( findLoop( i->dentry ))
-               y2warning( "duplicate loop file %s", i->dentry.c_str() );
+               y2war("duplicate loop file " << i->dentry);
            else if( !i->loop_dev.empty() && Volume::loopInUse( getStorage(),
                                                                i->loop_dev ) )
-               y2warning( "duplicate loop_device %s", i->loop_dev.c_str() );
+               y2war("duplicate loop_device " << i->loop_dev);
            else if( !checkNormalFile( lfile ))
-               y2warning( "file %s not existent or special", lfile.c_str() );
+               y2war("not existent or special file " << lfile);
            else
                {
                Loop *l = new Loop( *this, i->loop_dev, lfile,
@@ -178,8 +178,8 @@
                     unsigned long long sizeK, bool dmcr, string& device )
     {
     int ret = 0;
-    y2milestone( "file:%s reuseEx:%d sizeK:%llu dmcr:%d", file.c_str(),
-                 reuseExisting, sizeK, dmcr );
+    y2mil("file:" << file << " reuse:" << reuseExisting << " sizeK:" <<
+         sizeK << " dmcr:" << dmcr);
     if( readonly() )
        {
        ret = LOOP_CHANGE_READONLY;
@@ -205,8 +205,8 @@
                     bool reuseExisting, unsigned long long sizeK )
     {
     int ret = 0;
-    y2milestone( "device:%s file:%s reuse:%d sizeK:%lld", device.c_str(),
-                 file.c_str(), reuseExisting, sizeK );
+    y2mil("device:" << device << " reuse:" << reuseExisting << " sizeK:" <<
+         sizeK);
     LoopIter i;
     if( readonly() )
        {
@@ -236,7 +236,7 @@
 LoopCo::removeLoop( const string& file, bool removeFile )
     {
     int ret = 0;
-    y2milestone( "file:%s removeFile:%d", file.c_str(), removeFile );
+    y2mil("file:" << file << " removeFile:" << removeFile);
     LoopIter i;
     if( readonly() )
        {
@@ -271,7 +271,7 @@
 int LoopCo::removeVolume( Volume* v )
     {
     int ret = 0;
-    y2milestone( "name:%s", v->name().c_str() );
+    y2mil("name:" << v->name());
     Loop * l = dynamic_cast<Loop *>(v);
     if( l != NULL )
        ret = removeLoop( l->loopFile(), false );
@@ -284,7 +284,7 @@
 int
 LoopCo::doCreate( Volume* v )
     {
-    y2milestone( "name:%s", v->name().c_str() );
+    y2mil("name:" << v->name());
     Loop * l = dynamic_cast<Loop *>(v);
     int ret = 0;
     if( l != NULL )
@@ -313,7 +313,7 @@
 int
 LoopCo::doRemove( Volume* v )
     {
-    y2milestone( "name:%s", v->name().c_str() );
+    y2mil("name:" << v->name());
     Loop * l = dynamic_cast<Loop *>(v);
     int ret = 0;
     if( l != NULL )

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx