Author: aschnell
Date: Wed Nov 12 19:56:31 2008
New Revision: 53246
URL: http://svn.opensuse.org/viewcvs/yast?rev=53246&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/DmCo.cc
trunk/storage/libstorage/src/DmPartCo.cc
trunk/storage/libstorage/src/DmraidCo.cc
trunk/storage/libstorage/src/EtcFstab.cc
trunk/storage/libstorage/src/LoopCo.cc
trunk/storage/libstorage/src/LvmVg.cc
trunk/storage/libstorage/src/MdCo.cc
trunk/storage/libstorage/src/NfsCo.cc
trunk/storage/libstorage/src/Partition.cc
trunk/storage/libstorage/src/PeContainer.cc
trunk/storage/libstorage/src/Storage.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.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Container.cc (original)
+++ trunk/storage/libstorage/src/Container.cc Wed Nov 12 19:56:31 2008
@@ -143,7 +143,7 @@
default:
ret = VOLUME_COMMIT_UNKNOWN_STAGE;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -151,7 +151,7 @@
{
y2milestone( "name %s stage %d", name().c_str(), stage );
int ret = CONTAINER_INVALID_VIRTUAL_CALL;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/Dasd.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Dasd.cc (original)
+++ trunk/storage/libstorage/src/Dasd.cc Wed Nov 12 19:56:31 2008
@@ -307,7 +307,7 @@
PartPair p = partPair( notDeleted );
changeNumbers( p.begin(), p.end(), nr, -1 );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -348,7 +348,7 @@
device = p->device();
addToList( p );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -424,7 +424,7 @@
}
}
unlink( inpname.c_str() );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -520,7 +520,7 @@
{
ret = Disk::commitChanges( stage );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/Disk.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.cc (original)
+++ trunk/storage/libstorage/src/Disk.cc Wed Nov 12 19:56:31 2008
@@ -1310,7 +1310,7 @@
else
ret = DISK_CREATE_PARTITION_NO_SPACE;
getStorage()->logCo( this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1347,7 +1347,7 @@
}
else
ret = DISK_CREATE_PARTITION_NO_SPACE;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1480,7 +1480,7 @@
: DISK_CREATE_PARTITION_EXT_IMPOSSIBLE;
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1556,7 +1556,7 @@
{
part->changeRegion( start, len, cylinderToKb(len) );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1654,7 +1654,7 @@
}
}
getStorage()->logCo( this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1714,7 +1714,7 @@
getStorage()->setRecursiveRemoval(save);
setDeleted( true );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1740,7 +1740,7 @@
{
i->changeId( id );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1766,7 +1766,7 @@
{
i->unChangeId();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1804,7 +1804,7 @@
else
ret = DISK_SET_TYPE_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1818,7 +1818,7 @@
}
else
ret = DISK_COMMIT_NOTHING_TODO;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1895,7 +1895,7 @@
redetectGeometry();
}
gpt_enlarge = false;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2040,7 +2040,7 @@
{
ret = DISK_SET_TYPE_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2332,7 +2332,7 @@
{
ret = DISK_CREATE_PARTITION_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2382,7 +2382,7 @@
{
ret = DISK_REMOVE_PARTITION_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2485,7 +2485,7 @@
ret = DISK_CHECK_RESIZE_INVALID_VOLUME;
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2589,7 +2589,7 @@
{
ret = DISK_RESIZE_PARTITION_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/DmCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmCo.cc (original)
+++ trunk/storage/libstorage/src/DmCo.cc Wed Nov 12 19:56:31 2008
@@ -101,7 +101,7 @@
ret = ENC_TWOFISH256_OLD;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return ret;
}
@@ -298,7 +298,7 @@
i->setDeleted( true );
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -346,7 +346,7 @@
}
else
ret = DM_REMOVE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/DmPartCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPartCo.cc (original)
+++ trunk/storage/libstorage/src/DmPartCo.cc Wed Nov 12 19:56:31 2008
@@ -77,7 +77,7 @@
ret = disk->createPartition( type, start, len, device, checkRelaxed );
if( ret==0 )
ret = addNewDev( device );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -92,7 +92,7 @@
ret = disk->createPartition( len, device, checkRelaxed );
if( ret==0 )
ret = addNewDev( device );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -107,7 +107,7 @@
ret = disk->createPartition( type, device );
if( ret==0 )
ret = addNewDev( device );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -163,7 +163,7 @@
}
if( ret==0 )
ret = updateDelDev();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -182,7 +182,7 @@
if( ret==0 )
ret = updateDelDev();
getStorage()->logCo( this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -212,7 +212,7 @@
dm->updateSize();
}
y2mil( "dm:" << *dm );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -241,7 +241,7 @@
{
l->updateSize();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -445,7 +445,7 @@
getStorage()->setRecursiveRemoval(save);
del_ptable = true;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -456,7 +456,7 @@
{
ret = disk->changePartitionId( nr, id );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -467,7 +467,7 @@
{
ret = disk->forgetChangePartitionId( nr );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -496,7 +496,7 @@
if( findDm( nr, i ))
i->updateSize();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -542,7 +542,7 @@
}
ret = disk->doSetType( p );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -564,7 +564,7 @@
handleWholeDevice();
getStorage()->waitForDevice();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -597,7 +597,7 @@
{
unuseDev();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -684,7 +684,7 @@
else
ret = DMPART_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -702,7 +702,7 @@
}
else
ret = DMPART_COMMIT_NOTHING_TODO;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -769,7 +769,7 @@
if( p->type()!=EXTENDED )
getStorage()->waitForDevice( l->device() );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -817,7 +817,7 @@
}
if( ret==0 )
getStorage()->waitForDevice();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -870,7 +870,7 @@
}
if( ret==0 && remount )
ret = l->mount();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/DmraidCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmraidCo.cc (original)
+++ trunk/storage/libstorage/src/DmraidCo.cc Wed Nov 12 19:56:31 2008
@@ -218,7 +218,7 @@
setDeleted( false );
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/EtcFstab.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/EtcFstab.cc (original)
+++ trunk/storage/libstorage/src/EtcFstab.cc Wed Nov 12 19:56:31 2008
@@ -280,7 +280,7 @@
else
ret = FSTAB_CHANGE_PREFIX_IMPOSSIBLE;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -383,7 +383,7 @@
i->nnew = entry;
}
int ret = (i != co.end())?0:FSTAB_ENTRY_NOT_FOUND;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -806,7 +806,7 @@
printFile( prefix + "/fstab" );
printFile( prefix + "/cryptotab" );
printFile( prefix + "/crypttab" );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/LoopCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/LoopCo.cc (original)
+++ trunk/storage/libstorage/src/LoopCo.cc Wed Nov 12 19:56:31 2008
@@ -196,7 +196,7 @@
addToList( l );
device = l->device();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -228,7 +228,7 @@
if( !i->getReuse() )
i->setSize( sizeK );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -264,7 +264,7 @@
i->setDelFile( removeFile );
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -277,7 +277,7 @@
ret = removeLoop( l->loopFile(), false );
else
ret = LOOP_REMOVE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -306,7 +306,7 @@
}
else
ret = LOOP_CREATE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -333,7 +333,7 @@
}
else
ret = LOOP_REMOVE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/LvmVg.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/LvmVg.cc (original)
+++ trunk/storage/libstorage/src/LvmVg.cc Wed Nov 12 19:56:31 2008
@@ -85,7 +85,7 @@
{
unuseDev();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -164,7 +164,7 @@
if( ret==0 )
checkConsistency();
y2mil( "this:" << *this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -214,7 +214,7 @@
if( ret==0 )
checkConsistency();
y2mil( "this:" << *this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -239,7 +239,7 @@
}
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -361,7 +361,7 @@
}
if( ret==0 )
checkConsistency();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -415,7 +415,7 @@
else
i->setDeleted( true );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -467,7 +467,7 @@
free_pe -= i->getLe();
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -503,7 +503,7 @@
{
i->setStripeSize( stripeSize );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -961,7 +961,7 @@
ret = LVM_COMMIT_NOTHING_TODO;
break;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1191,7 +1191,7 @@
checkCreateConstraints();
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1221,7 +1221,7 @@
setDeleted( false );
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1273,7 +1273,7 @@
if( devs.size()>0 )
checkCreateConstraints();
y2mil( "this:" << *this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1317,7 +1317,7 @@
++d;
}
y2mil( "this:" << *this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1370,7 +1370,7 @@
}
else
ret = LVM_CREATE_LV_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1414,7 +1414,7 @@
else
ret = LVM_REMOVE_LV_INVALID_VOLUME;
y2mil( "this:" << *this );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1483,7 +1483,7 @@
}
else
ret = LVM_RESIZE_LV_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1520,7 +1520,7 @@
ret = LVM_CREATE_PV_FAILED;
setExtError( c );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/MdCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/MdCo.cc (original)
+++ trunk/storage/libstorage/src/MdCo.cc Wed Nov 12 19:56:31 2008
@@ -302,7 +302,7 @@
m->setCreated( true );
addToList( m );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -332,7 +332,7 @@
ret = MD_DEVICE_UNKNOWN;
else if( i->created() )
ret = i->checkDevices();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -372,7 +372,7 @@
string d = normalizeDevice( dev );
getStorage()->setUsedBy( d, UB_MD, "md"+decString(num) );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -404,7 +404,7 @@
string d = normalizeDevice( dev );
getStorage()->clearUsedBy(d);
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -431,7 +431,7 @@
{
i->setPersonality( ptype );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -458,7 +458,7 @@
{
i->setChunkSize( chunk );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -485,7 +485,7 @@
{
i->setParity( ptype );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -547,7 +547,7 @@
i->setDestroySb( destroySb );
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -635,7 +635,7 @@
}
else
ret = MD_CREATE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -687,7 +687,7 @@
}
else
ret = MD_REMOVE_INVALID_VOLUME;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/NfsCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/NfsCo.cc (original)
+++ trunk/storage/libstorage/src/NfsCo.cc Wed Nov 12 19:56:31 2008
@@ -78,7 +78,7 @@
else
nfs->setDeleted();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -106,7 +106,7 @@
{
ret = NFS_REMOVE_INVALID_VOLUME;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/Partition.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Partition.cc (original)
+++ trunk/storage/libstorage/src/Partition.cc Wed Nov 12 19:56:31 2008
@@ -301,7 +301,7 @@
}
else
ret = Volume::setFormat( val, new_fs );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -313,7 +313,7 @@
ret = VOLUME_MOUNT_EXTENDED_UNSUPPORTED;
else
ret = Volume::changeMount( val );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/PeContainer.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContainer.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/PeContainer.cc (original)
+++ trunk/storage/libstorage/src/PeContainer.cc Wed Nov 12 19:56:31 2008
@@ -77,7 +77,7 @@
pe_size = peSizeK;
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -276,7 +276,7 @@
{
y2mil( "pe_map:" << pe_map );
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -399,7 +399,7 @@
}
ret = true;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=53246&r1=53245&r2=53246&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Wed Nov 12 19:56:31 2008
@@ -1340,7 +1340,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1397,7 +1397,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1503,7 +1503,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1578,7 +1578,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1633,7 +1633,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1779,7 +1779,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1821,7 +1821,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1870,7 +1870,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1898,7 +1898,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1922,7 +1922,7 @@
{
ret = STORAGE_VOLUME_NOT_FOUND;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1950,7 +1950,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -1978,7 +1978,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2006,7 +2006,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2034,7 +2034,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2054,7 +2054,7 @@
{
ret = STORAGE_VOLUME_NOT_FOUND;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2083,7 +2083,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2138,7 +2138,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2193,7 +2193,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2227,7 +2227,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2262,7 +2262,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2313,7 +2313,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2341,7 +2341,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2369,7 +2369,7 @@
#ifdef DEBUG_LOOP_CRYPT_PASSWORD
y2milestone( "password:%s", pwd.c_str() );
#endif
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2397,7 +2397,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2464,7 +2464,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2492,7 +2492,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2530,7 +2530,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2577,7 +2577,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2606,7 +2606,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2636,7 +2636,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2666,7 +2666,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2716,7 +2716,7 @@
ret = removeLvmLv( vg, name );
else
ret = STORAGE_LVM_INVALID_DEVICE;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2743,7 +2743,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2772,7 +2772,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2801,7 +2801,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -2942,7 +2942,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3022,7 +3022,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3052,7 +3052,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3082,7 +3082,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3112,7 +3112,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3142,7 +3142,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3172,7 +3172,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3187,7 +3187,7 @@
ret = md->checkMd(num);
else
ret = STORAGE_MD_NOT_FOUND;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3328,7 +3328,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3468,7 +3468,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3494,7 +3494,7 @@
{
ret = checkCache();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3779,7 +3779,7 @@
i->setFstabAdded(false);
if( ret!=0 )
dumpObjectList();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3875,7 +3875,7 @@
logProcData();
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3922,7 +3922,7 @@
d->triggerUdevUpdate();
}
waitForDevice();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -3959,7 +3959,7 @@
ret = ret && dm->mapsTo( dev );
++v;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -4614,7 +4614,7 @@
c.execute(DMSETUPBIN " table | grep " + quote(table));
logProcData();
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5183,7 +5183,7 @@
{
ret = STORAGE_CONTAINER_NOT_FOUND;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5277,7 +5277,7 @@
ret = true;
}
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5308,7 +5308,7 @@
}
else
ret = false;
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5358,7 +5358,7 @@
delete fstab;
infos = vil;
ret = !infos.empty();
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5575,7 +5575,7 @@
}
}
y2mil( "states:" << backupStates() );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
if( ret==0 )
y2milestone( "comp:%d", equalBackupStates( name, "", true ));
return( ret );
@@ -5604,7 +5604,7 @@
deleteBackups();
}
y2mil( "states:" << backupStates() );
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5630,7 +5630,7 @@
else
ret = STORAGE_BACKUP_STATE_NOT_FOUND;
}
- y2milestone( "ret:%d", ret );
+ y2mil("ret:" << ret);
return( ret );
}
@@ -5642,7 +5642,7 @@
y2milestone( "name:%s", name.c_str() );
map