[yast-commit] r49728 - in /trunk/storage/libstorage/src: Container.cc Container.h

Author: aschnell Date: Tue Aug 5 17:19:01 2008 New Revision: 49728 URL: http://svn.opensuse.org/viewcvs/yast?rev=49728&view=rev Log: - removed unused variable - added const to Container::type_names Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=49728&r1=49727&r2=49728&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Tue Aug 5 17:19:01 2008 @@ -416,6 +416,6 @@ *this = rhs; } -string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", - "DM", "EVMS", "DMRAID", "NFS" }; +const string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", + "DM", "EVMS", "DMRAID", "NFS" }; Modified: trunk/storage/libstorage/src/Container.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.h?rev=49728&r1=49727&r2=49728&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.h (original) +++ trunk/storage/libstorage/src/Container.h Tue Aug 5 17:19:01 2008 @@ -48,14 +48,13 @@ virtual void logDifference( const Container& c ) const; virtual void getCommitActions( std::liststorage::commitAction*& l ) const; - virtual int getToCommit( storage::CommitStage stage, + virtual int getToCommit( storage::CommitStage stage, std::list& col, std::list& vol ); virtual int commitChanges( storage::CommitStage stage ); virtual int commitChanges( storage::CommitStage stage, Volume* vol ); - virtual void changeDeviceName( const string& old, const string& nw ) - {}; + virtual void changeDeviceName( const string& old, const string& nw ) {} unsigned numVolumes() const; bool isEmpty() const; void getInfo( storage::ContainerInfo& info ) const; @@ -142,7 +141,7 @@ void setDeleted( bool val=true ) { del=val; } void setCreated( bool val=true ) { create=val; } void setSilent( bool val=true ) { silent=val; } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name );} + void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name ); } const storage::usedBy& getUsedBy() const { return( uby ); } storage::UsedByType getUsedByType() const { return( uby.type() ); } const string& usedByName() const { return( uby.name() ); } @@ -177,15 +176,14 @@ virtual int doCreate( Volume * v ); virtual int doRemove( Volume * v ); virtual int doResize( Volume * v ); - virtual void logData( const string& Dir ) {;} + virtual void logData( const string& Dir ) {} Container& operator=( const Container& ); static bool stageDecrease( const Volume& v ) { return( v.deleted()||v.needShrink()); } static bool stageCreate( const Volume& v ) { return( v.created()||v.needExtend()); } - static string type_names[COTYPE_LAST_ENTRY]; - static unsigned order[COTYPE_LAST_ENTRY]; + static const string type_names[COTYPE_LAST_ENTRY]; Storage * const sto; storage::CType typ; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org