Author: aschnell Date: Mon Aug 18 17:53:48 2008 New Revision: 50189 URL: http://svn.opensuse.org/viewcvs/yast?rev=50189&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/EtcFstab.cc trunk/storage/libstorage/src/EtcFstab.h trunk/storage/libstorage/src/EtcRaidtab.cc trunk/storage/libstorage/src/EtcRaidtab.h Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.cc?rev=50189&r1=50188&r2=50189&view=diff ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Mon Aug 18 17:53:48 2008 @@ -4,7 +4,7 @@ */ -#include <sstream> +#include <fstream> #include <algorithm> #include "y2storage/AppUtil.h" Modified: trunk/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.h?rev=50189&r1=50188&r2=50189&view=diff ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.h (original) +++ trunk/storage/libstorage/src/EtcFstab.h Mon Aug 18 17:53:48 2008 @@ -6,7 +6,6 @@ #include <map> #include "y2storage/StorageInterface.h" -#include "y2storage/AppUtil.h" namespace storage { Modified: trunk/storage/libstorage/src/EtcRaidtab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidtab.cc?rev=50189&r1=50188&r2=50189&view=diff ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.cc (original) +++ trunk/storage/libstorage/src/EtcRaidtab.cc Mon Aug 18 17:53:48 2008 @@ -18,16 +18,12 @@ { mdadm_dev_line = -1; mdadmname = prefix+"/etc/mdadm.conf"; - comment = new Regex( "^[ \t]*#" ); - whitespace = new Regex( "^[ \t]*$" ); mdadm = new AsciiFile( mdadmname ); buildMdadmMap(); } EtcRaidtab::~EtcRaidtab() { - delete whitespace; - delete comment; delete mdadm; } Modified: trunk/storage/libstorage/src/EtcRaidtab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidtab.h?rev=50189&r1=50188&r2=50189&view=diff ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.h (original) +++ trunk/storage/libstorage/src/EtcRaidtab.h Mon Aug 18 17:53:48 2008 @@ -31,14 +31,12 @@ void updateMdadmFile(); void buildMdadmMap(); - Regex *whitespace; - Regex *comment; string mdadmname; int mdadm_dev_line; std::map mtab; AsciiFile* mdadm; }; -/////////////////////////////////////////////////////////////////// + inline std::ostream& operator<< (std::ostream& s, const EtcRaidtab::entry& v ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org