Author: aschnell
Date: Thu Apr 16 15:18:47 2009
New Revision: 56814
URL: http://svn.opensuse.org/viewcvs/yast?rev=56814&view=rev
Log:
- avoid manual memory management
Modified:
trunk/storage/libstorage/src/Container.cc
trunk/storage/libstorage/src/Container.h
trunk/storage/libstorage/src/Dasd.cc
trunk/storage/libstorage/src/Dasd.h
trunk/storage/libstorage/src/Disk.cc
trunk/storage/libstorage/src/Disk.h
trunk/storage/libstorage/src/DmPart.cc
trunk/storage/libstorage/src/DmPart.h
trunk/storage/libstorage/src/DmPartCo.cc
trunk/storage/libstorage/src/DmPartCo.h
trunk/storage/libstorage/src/LvmVg.cc
trunk/storage/libstorage/src/LvmVg.h
trunk/storage/libstorage/src/Partition.cc
trunk/storage/libstorage/src/Partition.h
trunk/storage/libstorage/src/Storage.cc
trunk/storage/libstorage/src/Storage.h
trunk/storage/libstorage/src/Volume.cc
trunk/storage/libstorage/src/Volume.h
Modified: trunk/storage/libstorage/src/Container.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Container.cc (original)
+++ trunk/storage/libstorage/src/Container.cc Thu Apr 16 15:18:47 2009
@@ -154,7 +154,9 @@
return( ret );
}
-void Container::getCommitActions( list& l ) const
+
+void
+Container::getCommitActions(list<commitAction>& l) const
{
ConstVolPair p = volPair();
for( ConstVolIterator i=p.begin(); i!=p.end(); ++i )
@@ -162,6 +164,7 @@
i->getCommitActions( l );
}
+
string Container::createText( bool doing ) const
{
string txt;
Modified: trunk/storage/libstorage/src/Container.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Container.h (original)
+++ trunk/storage/libstorage/src/Container.h Thu Apr 16 15:18:47 2009
@@ -50,7 +50,7 @@
virtual string getDiffString( const Container& c ) const;
virtual void logDifference( const Container& c ) const;
- virtual void getCommitActions(liststorage::commitAction*& l) const;
+ virtual void getCommitActions(list<commitAction>& l) const;
virtual void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
Modified: trunk/storage/libstorage/src/Dasd.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Dasd.cc (original)
+++ trunk/storage/libstorage/src/Dasd.cc Thu Apr 16 15:18:47 2009
@@ -427,28 +427,27 @@
return( ret );
}
-void Dasd::getCommitActions( list& l ) const
+
+void
+Dasd::getCommitActions(list<commitAction>& l) const
{
y2mil("begin:" << name() << " init_disk:" << init_disk);
Disk::getCommitActions( l );
if( init_disk )
{
- list::iterator i = l.begin();
+ list<commitAction>::iterator i = l.begin();
while( i!=l.end() )
{
- if( (*i)->stage==DECREASE )
- {
- delete( *i );
+ if( i->stage==DECREASE )
i=l.erase( i );
- }
else
++i;
}
- l.push_front( new commitAction( DECREASE, staticType(),
- dasdfmtText(false), this, true ));
+ l.push_front(commitAction(DECREASE, staticType(), dasdfmtText(false), this, true));
}
}
+
string Dasd::dasdfmtTexts( bool single, const string& devs )
{
string txt;
Modified: trunk/storage/libstorage/src/Dasd.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Dasd.h (original)
+++ trunk/storage/libstorage/src/Dasd.h Thu Apr 16 15:18:47 2009
@@ -29,7 +29,7 @@
string fdasdText() const;
string dasdfmtText( bool doing ) const;
static string dasdfmtTexts( bool single, const string& devs );
- void getCommitActions(liststorage::commitAction*& l) const;
+ void getCommitActions(list<commitAction>& l) const;
void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
int commitChanges( storage::CommitStage stage );
Modified: trunk/storage/libstorage/src/Disk.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.cc (original)
+++ trunk/storage/libstorage/src/Disk.cc Thu Apr 16 15:18:47 2009
@@ -1806,27 +1806,26 @@
return( ret );
}
-void Disk::getCommitActions( list& l ) const
+
+void
+Disk::getCommitActions(list<commitAction>& l) const
{
Container::getCommitActions( l );
if( deleted() )
{
- list::iterator i = l.begin();
+ list<commitAction>::iterator i = l.begin();
while( i!=l.end() )
{
- if( (*i)->stage==DECREASE )
- {
- delete( *i );
+ if( i->stage==DECREASE )
i=l.erase( i );
- }
else
++i;
}
- l.push_front( new commitAction( DECREASE, staticType(),
- setDiskLabelText(false), this, true ));
+ l.push_front(commitAction(DECREASE, staticType(), setDiskLabelText(false), this, true));
}
}
+
string Disk::setDiskLabelText( bool doing ) const
{
string txt;
Modified: trunk/storage/libstorage/src/Disk.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.h (original)
+++ trunk/storage/libstorage/src/Disk.h Thu Apr 16 15:18:47 2009
@@ -81,7 +81,7 @@
string& device) const;
int destroyPartitionTable( const string& new_label );
unsigned availablePartNumber(storage::PartitionType type = storage::PRIMARY) const;
- virtual void getCommitActions(liststorage::commitAction*& l) const;
+ virtual void getCommitActions(list<commitAction>& l) const;
virtual void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
virtual int commitChanges( storage::CommitStage stage );
Modified: trunk/storage/libstorage/src/DmPart.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPart.cc (original)
+++ trunk/storage/libstorage/src/DmPart.cc Thu Apr 16 15:18:47 2009
@@ -137,18 +137,20 @@
}
-void DmPart::getCommitActions( std::liststorage::commitAction*& l ) const
+void
+DmPart::getCommitActions(list<commitAction>& l) const
{
unsigned s = l.size();
Dm::getCommitActions(l);
if( p )
{
if( s==l.size() && Partition::toChangeId( *p ) )
- l.push_back( new commitAction( INCREASE, cont->staticType(),
- setTypeText(false), this, false ));
+ l.push_back(commitAction(INCREASE, cont->staticType(),
+ setTypeText(false), this, false));
}
}
+
string DmPart::setTypeText( bool doing ) const
{
string txt;
Modified: trunk/storage/libstorage/src/DmPart.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPart.h (original)
+++ trunk/storage/libstorage/src/DmPart.h Thu Apr 16 15:18:47 2009
@@ -30,7 +30,7 @@
void updateMinor();
void updateSize( ProcPart& pp );
void updateSize();
- void getCommitActions(liststorage::commitAction*& l) const;
+ void getCommitActions(list<commitAction>& l) const;
void addUdevData();
virtual const std::list<string> udevId() const;
virtual string setTypeText( bool doing=true ) const;
Modified: trunk/storage/libstorage/src/DmPartCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPartCo.cc (original)
+++ trunk/storage/libstorage/src/DmPartCo.cc Thu Apr 16 15:18:47 2009
@@ -716,32 +716,30 @@
return( ret );
}
-void DmPartCo::getCommitActions( list& l ) const
+
+void
+DmPartCo::getCommitActions(list<commitAction>& l) const
{
y2mil( "l:" << l );
Container::getCommitActions( l );
y2mil( "l:" << l );
if( deleted() || del_ptable )
{
- list::iterator i = l.begin();
+ list<commitAction>::iterator i = l.begin();
while( i!=l.end() )
{
- if( (*i)->stage==DECREASE )
- {
- delete( *i );
+ if( i->stage==DECREASE )
i=l.erase( i );
- }
else
++i;
}
- string txt = deleted() ? removeText(false) :
- setDiskLabelText(false);
- l.push_front( new commitAction( DECREASE, staticType(),
- txt, this, true ));
+ string txt = deleted() ? removeText(false) : setDiskLabelText(false);
+ l.push_front(commitAction(DECREASE, staticType(), txt, this, true));
}
y2mil( "l:" << l );
}
+
int
DmPartCo::doCreate( Volume* v )
{
Modified: trunk/storage/libstorage/src/DmPartCo.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPartCo.h (original)
+++ trunk/storage/libstorage/src/DmPartCo.h Thu Apr 16 15:18:47 2009
@@ -74,7 +74,7 @@
{ return disk->kbToCylinder( val ); }
string getPartName( unsigned nr ) const;
- virtual void getCommitActions(liststorage::commitAction*& l) const;
+ virtual void getCommitActions(list<commitAction>& l) const;
virtual void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
virtual int commitChanges( storage::CommitStage stage );
Modified: trunk/storage/libstorage/src/LvmVg.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/LvmVg.cc (original)
+++ trunk/storage/libstorage/src/LvmVg.cc Thu Apr 16 15:18:47 2009
@@ -969,37 +969,36 @@
return( ret );
}
-void LvmVg::getCommitActions( list& l ) const
+
+void
+LvmVg::getCommitActions(list<commitAction>& l) const
{
Container::getCommitActions( l );
y2mil( "Container::getCommitActions:" << l );
if( deleted() )
{
- l.push_back( new commitAction( DECREASE, staticType(),
- removeVgText(false), this, true ));
+ l.push_back(commitAction(DECREASE, staticType(), removeVgText(false), this, true));
}
else if( created() )
{
- l.push_front( new commitAction( INCREASE, staticType(),
- createVgText(false), this, true ));
+ l.push_front(commitAction( INCREASE, staticType(), createVgText(false), this, true));
}
else
{
if( !pv_add.empty() )
for( list<Pv>::const_iterator i=pv_add.begin(); i!=pv_add.end();
++i )
- l.push_back( new commitAction( INCREASE, staticType(),
- extendVgText(false,i->device),
- this, true ));
+ l.push_back(commitAction(INCREASE, staticType(),
+ extendVgText(false, i->device), this, true));
if( !pv_remove.empty() )
for( list<Pv>::const_iterator i=pv_remove.begin();
i!=pv_remove.end(); ++i )
- l.push_back( new commitAction( DECREASE, staticType(),
- reduceVgText(false,i->device),
- this, false ));
+ l.push_back(commitAction(DECREASE, staticType(),
+ reduceVgText(false, i->device), this, false ));
}
}
+
string
LvmVg::removeVgText( bool doing ) const
{
Modified: trunk/storage/libstorage/src/LvmVg.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/LvmVg.h (original)
+++ trunk/storage/libstorage/src/LvmVg.h Thu Apr 16 15:18:47 2009
@@ -45,7 +45,7 @@
int setPeSize( long long unsigned peSizeK );
void normalizeDmDevices();
- void getCommitActions(liststorage::commitAction*& l) const;
+ void getCommitActions(list<commitAction>& l) const;
void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
int commitChanges( storage::CommitStage stage );
Modified: trunk/storage/libstorage/src/Partition.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Partition.cc (original)
+++ trunk/storage/libstorage/src/Partition.cc Thu Apr 16 15:18:47 2009
@@ -541,7 +541,9 @@
return( txt );
}
-void Partition::getCommitActions( list& l ) const
+
+void
+Partition::getCommitActions(list<commitAction>& l) const
{
unsigned s = l.size();
bool change_id = idt!=orig_id;
@@ -550,11 +552,12 @@
change_id = false;
if( change_id )
{
- l.push_back( new commitAction( INCREASE, cont->staticType(),
- setTypeText(false), this, false ));
+ l.push_back(commitAction(INCREASE, cont->staticType(),
+ setTypeText(false), this, false));
}
}
+
Partition::~Partition()
{
y2deb("destructed partition " << dev);
Modified: trunk/storage/libstorage/src/Partition.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Partition.h (original)
+++ trunk/storage/libstorage/src/Partition.h Thu Apr 16 15:18:47 2009
@@ -53,7 +53,7 @@
string createText( bool doing=true ) const;
string formatText(bool doing=true) const;
string resizeText(bool doing=true) const;
- void getCommitActions(liststorage::commitAction*& l) const;
+ void getCommitActions(list<commitAction>& l) const;
string setTypeText( bool doing=true ) const;
int setFormat( bool format=true, storage::FsType fs=storage::REISERFS );
int changeMount( const string& val );
Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Thu Apr 16 15:18:47 2009
@@ -3531,27 +3531,26 @@
y2mil("empty:" << p.empty());
if( !p.empty() )
{
- list ac;
+ list<commitAction> ac;
for( ConstContIterator i = p.begin(); i != p.end(); ++i )
{
- list l;
+ list<commitAction> l;
i->getCommitActions( l );
ac.splice( ac.end(), l );
}
- ac.sort(deref_less<commitAction>());
- for( list::const_iterator i=ac.begin(); i!=ac.end(); ++i )
+ ac.sort();
+ for (list<commitAction>::const_iterator i = ac.begin(); i != ac.end(); ++i)
{
CommitInfo info;
- info.destructive = (*i)->destructive;
- info.text = (*i)->description;
- const Volume *v = (*i)->vol();
+ info.destructive = i->destructive;
+ info.text = i->description;
+ const Volume* v = i->vol();
if( v && !v->getDescText().empty() )
{
info.text += ". ";
info.text += v->getDescText();
}
s_infos.push_back(info);
- delete *i;
}
}
infos = s_infos;
@@ -3626,9 +3625,10 @@
return( rhs->getMount()<lhs->getMount() );
}
+
void
-Storage::sortCommitLists( CommitStage stage, list& co,
- list& vl, list& todo ) const
+Storage::sortCommitLists(CommitStage stage, list& co,
+ list& vl, list<commitAction>& todo) const
{
co.sort( (stage==DECREASE)?sort_cont_up:sort_cont_down );
std::ostringstream b;
@@ -3645,24 +3645,24 @@
else
vl.sort( sort_vol_normal );
for( list::const_iterator i=co.begin(); i!=co.end(); ++i )
- todo.push_back( new commitAction( stage, (*i)->type(), *i ));
+ todo.push_back(commitAction(stage, (*i)->type(), *i));
for( list::const_iterator i=vl.begin(); i!=vl.end(); ++i )
- todo.push_back( new commitAction( stage, (*i)->cType(), *i ));
+ todo.push_back(commitAction(stage, (*i)->cType(), *i));
b.str("");
b << "unsorted actions <";
- for( list::const_iterator i=todo.begin(); i!=todo.end(); ++i )
+ for (list<commitAction>::const_iterator i = todo.begin(); i != todo.end(); ++i)
{
if( i!=todo.begin() )
b << " ";
- if( (*i)->container )
- b << "C:" << (*i)->co()->device();
+ if( i->container )
+ b << "C:" << i->co()->device();
else
- b << "V:" << (*i)->vol()->device();
+ b << "V:" << i->vol()->device();
}
b << "> ";
y2mil(b.str());
b.str("");
- todo.sort(deref_less<commitAction>());
+ todo.sort();
y2mil("stage:" << stage);
b << "sorted co <";
for( list::const_iterator i=co.begin(); i!=co.end(); ++i )
@@ -3685,14 +3685,14 @@
y2mil(b.str());
b.str("");
b << "sorted actions <";
- for( list::const_iterator i=todo.begin(); i!=todo.end(); ++i )
+ for (list<commitAction>::const_iterator i = todo.begin(); i != todo.end(); ++i)
{
if( i!=todo.begin() )
b << " ";
- if( (*i)->container )
- b << "C:" << (*i)->co()->device();
+ if( i->container )
+ b << "C:" << i->co()->device();
else
- b << "V:" << (*i)->vol()->device();
+ b << "V:" << i->vol()->device();
}
b << "> ";
y2mil(b.str());
@@ -3756,16 +3756,16 @@
}
bool
-Storage::ignoreError(list::const_iterator i, const list& al) const
+Storage::ignoreError(list<commitAction>::const_iterator i, const list<commitAction>& al) const
{
bool ret = false;
- if( !(*i)->container && (*i)->type==DISK && (*i)->stage==DECREASE )
+ if( !i->container && i->type==DISK && i->stage==DECREASE )
{
++i;
while( ret==false && i!=al.end() )
{
- y2mil( "it:" << **i );
- ret = (*i)->container && (*i)->type==DISK && (*i)->stage==DECREASE;
+ y2mil( "it:" << *i );
+ ret = i->container && i->type==DISK && i->stage==DECREASE;
++i;
}
}
@@ -3794,15 +3794,15 @@
}
bool new_pair = false;
- list todo;
+ list<commitAction> todo;
sortCommitLists(*stage, colist, vlist, todo);
- list::iterator ac = todo.begin();
+ list<commitAction>::iterator ac = todo.begin();
while( ret==0 && ac != todo.end() )
{
- bool cont = (*ac)->container;
- CType type = (*ac)->type;
- Container *co = cont ? const_cast((*ac)->co()) :
- const_cast((*ac)->vol()->getContainer());
+ bool cont = ac->container;
+ CType type = ac->type;
+ Container *co = cont ? const_cast(ac->co()) :
+ const_cast(ac->vol()->getContainer());
if( cont )
{
bool cont_removed = co->deleted() && type==LVM;
@@ -3816,15 +3816,14 @@
}
else
{
- ret = co->commitChanges(*stage, const_cast((*ac)->vol()));
+ ret = co->commitChanges(*stage, const_cast(ac->vol()));
}
if( ret!=0 )
{
- y2mil( "err at " << **ac );
+ y2mil("err at " << *ac);
if( ignoreError( ac, todo ))
ret = 0;
}
- delete( *ac );
++ac;
}
y2mil("stage:" << *stage << " new_pair:" << new_pair);
Modified: trunk/storage/libstorage/src/Storage.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.h (original)
+++ trunk/storage/libstorage/src/Storage.h Thu Apr 16 15:18:47 2009
@@ -1688,11 +1688,9 @@
int removeContainer( Container* val, bool call_del=true );
void logVolumes(const string& Dir) const;
int commitPair( CPair& p, bool (* fnc)( const Container& ) );
- void sortCommitLists( storage::CommitStage stage,
- std::list& co,
- std::list& vl,
- std::liststorage::commitAction*& todo ) const;
- bool ignoreError(list::const_iterator i, const list& al) const;
+ void sortCommitLists(storage::CommitStage stage, list& co,
+ list& vl, list<commitAction>& todo) const;
+ bool ignoreError(list<commitAction>::const_iterator i, const list<commitAction>& al) const;
string backupStates() const;
void detectObjects();
void deleteClist( CCont& co );
Modified: trunk/storage/libstorage/src/Volume.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Volume.cc (original)
+++ trunk/storage/libstorage/src/Volume.cc Thu Apr 16 15:18:47 2009
@@ -2216,51 +2216,46 @@
return( ret );
}
-void Volume::getCommitActions( list& l ) const
+
+void
+Volume::getCommitActions(list<commitAction>& l) const
{
if( deleted() )
{
- l.push_back( new commitAction( DECREASE, cont->type(),
- removeText(false), this, true ));
+ l.push_back(commitAction(DECREASE, cont->type(), removeText(false), this, true));
}
else if( needShrink() )
{
- l.push_back( new commitAction( DECREASE, cont->type(),
- resizeText(false), this, true ));
+ l.push_back(commitAction(DECREASE, cont->type(), resizeText(false), this, true));
}
else if( created() )
{
- l.push_back( new commitAction( INCREASE, cont->type(),
- createText(false), this, false ));
+ l.push_back(commitAction(INCREASE, cont->type(), createText(false), this, false));
}
else if( needExtend() )
{
- l.push_back( new commitAction( INCREASE, cont->type(),
- resizeText(false), this, true ));
+ l.push_back(commitAction(INCREASE, cont->type(), resizeText(false), this, true));
}
else if( format )
{
- l.push_back( new commitAction( FORMAT, cont->type(),
- formatText(false), this, true ));
+ l.push_back(commitAction(FORMAT, cont->type(), formatText(false), this, true));
}
else if( mp != orig_mp ||
(cont->getStorage()->instsys()&&mp=="swap") )
{
- l.push_back( new commitAction( MOUNT, cont->type(),
- mountText(false), this, false ));
+ l.push_back(commitAction(MOUNT, cont->type(), mountText(false), this, false));
}
else if( label != orig_label )
{
- l.push_back( new commitAction( MOUNT, cont->type(),
- labelText(false), this, false ));
+ l.push_back(commitAction(MOUNT, cont->type(), labelText(false), this, false));
}
else if( needFstabUpdate() )
{
- l.push_back( new commitAction( MOUNT, cont->type(),
- fstabUpdateText(), this, false ));
+ l.push_back(commitAction(MOUNT, cont->type(), fstabUpdateText(), this, false));
}
}
+
string Volume::fstabUpdateText() const
{
string txt;
Modified: trunk/storage/libstorage/src/Volume.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?rev=56814&r1=56813&r2=56814&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Volume.h (original)
+++ trunk/storage/libstorage/src/Volume.h Thu Apr 16 15:18:47 2009
@@ -155,7 +155,7 @@
virtual string createText(bool doing=true) const;
virtual string resizeText(bool doing=true) const;
virtual string formatText(bool doing=true) const;
- virtual void getCommitActions(liststorage::commitAction*& l) const;
+ virtual void getCommitActions(list<commitAction>& l) const;
string mountText( bool doing=true ) const;
string labelText( bool doing=true ) const;
string losetupText( bool doing=true ) const;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org