Author: aschnell Date: Fri Mar 13 12:25:31 2009 New Revision: 56107 URL: http://svn.opensuse.org/viewcvs/yast?rev=56107&view=rev Log: - removed unused code Modified: trunk/storage/libstorage/src/AsciiFile.cc trunk/storage/libstorage/src/AsciiFile.h Modified: trunk/storage/libstorage/src/AsciiFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile.cc?rev=56107&r1=56106&r2=56107&view=diff ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.cc (original) +++ trunk/storage/libstorage/src/AsciiFile.cc Fri Mar 13 12:25:31 2009 @@ -9,7 +9,6 @@ #include <fstream> #include "y2storage/AppUtil.h" -#include "y2storage/Regex.h" #include "y2storage/SystemCmd.h" #include "y2storage/AsciiFile.h" @@ -17,24 +16,12 @@ using namespace storage; -AsciiFile::AsciiFile( bool CreateBackup_bv, const char* BackupExt_Cv ) : - BackupCreated_b(!CreateBackup_bv), - BackupExtension_C( BackupExt_Cv ) -{ -} - -AsciiFile::AsciiFile( const char* Name_Cv, bool CreateBackup_bv, - const char* BackupExt_Cv ) : - BackupCreated_b(!CreateBackup_bv), - BackupExtension_C( BackupExt_Cv ) +AsciiFile::AsciiFile(const char* Name_Cv) { loadFile( Name_Cv ); } -AsciiFile::AsciiFile( const string& Name_Cv, bool CreateBackup_bv, - const char* BackupExt_Cv ) : - BackupCreated_b(!CreateBackup_bv), - BackupExtension_C( BackupExt_Cv ) +AsciiFile::AsciiFile(const string& Name_Cv) { loadFile( Name_Cv.c_str() ); } @@ -148,28 +135,6 @@ struct stat Stat_ri; bool Status_b = stat( Name_C.c_str(), &Stat_ri )==0; - if( !BackupCreated_b ) - { - string BakName_Ci = Name_C + BackupExtension_C; - if( access( Name_C.c_str(), R_OK ) == 0 ) - { - string OldBakName_Ci = BakName_Ci + ".o"; - if( access( BakName_Ci.c_str(), R_OK ) == 0 && - access( OldBakName_Ci.c_str(), R_OK ) != 0 ) - { - int r = link( BakName_Ci.c_str(), OldBakName_Ci.c_str() ); - if( r==0 ) - unlink( BakName_Ci.c_str() ); - } - SystemCmd Cmd_Ci; - string Tmp_Ci = "cp -a "; - Tmp_Ci += Name_C; - Tmp_Ci += ' '; - Tmp_Ci += BakName_Ci; - Cmd_Ci.execute( Tmp_Ci ); - } - BackupCreated_b = true; - } ofstream File_Ci( Name_C.c_str() ); classic(File_Ci); unsigned int Idx_ii = 0; @@ -197,20 +162,6 @@ return ret; } -bool AsciiFile::saveToFile(const string& Name_Cv) const - { - ofstream File_Ci( Name_Cv.c_str() ); - classic(File_Ci); - unsigned int Idx_ii = 0; - - while( File_Ci.good() && Idx_ii < Lines_C.size() ) - { - File_Ci << Lines_C[Idx_ii] << std::endl; - Idx_ii++; - } - return File_Ci.good(); - } - void AsciiFile::append( const string& Line_Cv ) { Modified: trunk/storage/libstorage/src/AsciiFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile.h?rev=56107&r1=56106&r2=56107&view=diff ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.h (original) +++ trunk/storage/libstorage/src/AsciiFile.h Fri Mar 13 12:25:31 2009 @@ -13,19 +13,12 @@ using std::vector; - class Regex; - - class AsciiFile { public: - AsciiFile( bool CreateBackup_bv=false, - const char* BackupExt_Cv=".orig" ); - AsciiFile( const char* Name_Cv, bool CreateBackup_bv=false, - const char* BackupExt_Cv=".orig" ); - AsciiFile( const string& Name_Cv, bool CreateBackup_bv=false, - const char* BackupExt_Cv=".orig" ); + AsciiFile(const char* Name_Cv); + AsciiFile(const string& Name_Cv); ~AsciiFile(); bool insertFile(const AsciiFile& File_Cv, unsigned int BeforeLine_iv = 0); @@ -36,7 +29,6 @@ string fileName() const { return Name_C; } bool loadFile( const string& Name_Cv ); bool updateFile(); - bool saveToFile(const string& Name_Cv) const; void append( const string& Line_Cv ); void append( const vector<string>& Lines_Cv ); @@ -71,8 +63,6 @@ bool appendFile(const AsciiFile& File_Cv, vector<string>& Lines_Cr) const; void removeLastIf(string& Text_Cr, char Char_cv) const; - bool BackupCreated_b; - string BackupExtension_C; vector<string> Lines_C; string Name_C; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org