Author: aschnell Date: Wed Feb 25 18:21:03 2009 New Revision: 55758 URL: http://svn.opensuse.org/viewcvs/yast?rev=55758&view=rev Log: - removed unused code Modified: trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd.cc?rev=55758&r1=55757&r2=55758&view=diff ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Wed Feb 25 18:21:03 2009 @@ -634,44 +634,6 @@ } -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : SystemCmd::PlaceOutput -// METHOD TYPE : int -// -// INPUT : -// OUTPUT : -// DESCRIPTION : Place stdout/stderr linewise in Ret_Cr -// -int SystemCmd::placeOutput( unsigned Which_iv, vector<string> &Ret_Cr, - const bool Append_bv ) const -{ - if ( !Append_bv ) - Ret_Cr.clear(); - - int Lines_ii = numLines( false, Which_iv ); - - for ( int i_ii = 0; i_ii < Lines_ii; i_ii++ ) - Ret_Cr.push_back( *getLine( i_ii, false, Which_iv ) ); - - return Lines_ii; -} - -int SystemCmd::placeOutput( unsigned Which_iv, list<string> &Ret_Cr, - const bool Append_bv ) const -{ - if ( !Append_bv ) - Ret_Cr.clear(); - - int Lines_ii = numLines( false, Which_iv ); - - for ( int i_ii = 0; i_ii < Lines_ii; i_ii++ ) - Ret_Cr.push_back( *getLine( i_ii, false, Which_iv ) ); - - return Lines_ii; -} - - string SystemCmd::quote(const string& str) { return "'" + boost::replace_all_copy(str, "'", "'\\''") + "'"; Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd.h?rev=55758&r1=55757&r2=55758&view=diff ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Wed Feb 25 18:21:03 2009 @@ -46,15 +46,6 @@ void setCombine( const bool Combine_b=true ); int retcode() const { return Ret_i; } - int getStdout( std::vector<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDOUT, Ret_Cr, Append_bv); } - int getStderr( std::vector<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDERR, Ret_Cr, Append_bv); } - int getStdout( std::list<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDOUT, Ret_Cr, Append_bv); } - int getStderr( std::list<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDERR, Ret_Cr, Append_bv); } - /** * Quotes and protects a single string for shell execution. */ @@ -69,9 +60,6 @@ protected: - int placeOutput( unsigned Which_iv, std::vector<string> &Ret_Cr, const bool Append_bv ) const; - int placeOutput( unsigned Which_iv, std::list<string> &Ret_Cr, const bool Append_bv ) const; - void invalidate(); void closeOpenFds(); int doExecute( string Cmd_Cv ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org