Author: aschnell Date: Tue Mar 31 12:13:13 2009 New Revision: 56487 URL: http://svn.opensuse.org/viewcvs/yast?rev=56487&view=rev Log: - some refactoring Modified: trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/ProcPart.cc Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMounts.cc?rev=56487&r1=56486&r2=56487&view=diff ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Tue Mar 31 12:13:13 2009 @@ -7,6 +7,7 @@ #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" +#include "y2storage/AsciiFile.h" #include "y2storage/ProcMounts.h" #include "y2storage/StorageTmpl.h" #include "y2storage/Storage.h" @@ -106,26 +107,21 @@ co[dev].mount = "/"; } mounts.close(); - mounts.clear(); - mounts.open( "/proc/swaps" ); - getline( mounts, line ); - y2mil( "swap line:\"" << line << "\"" ); - getline( mounts, line ); - while( mounts.good() ) - { - y2mil( "swap line:\"" << line << "\"" ); - string::size_type pos; - string dev = extractNthWord( 0, line ); - if( (pos=dev.find( "\\040(deleted)" ))!=string::npos ) - { - y2mil( "dev:" << dev ); - dev.erase( pos ); - } + + AsciiFile swaps("/proc/swaps"); + swaps.remove(0, 1); + + for (vector<string>::const_iterator it = swaps.lines().begin(); it != swaps.lines().end(); ++it) + { + string dev = extractNthWord(0, *it); + string::size_type pos = dev.find("\\040(deleted)"); + if (pos != string::npos) + dev.erase(pos); + co[dev].device = dev; co[dev].mount = "swap"; co[dev].fs = "swap"; - getline( mounts, line ); - } + } for (map::const_iterator it = co.begin(); it != co.end(); ++it) y2mil("co:[" << it->first << "]-->" << it->second); Modified: trunk/storage/libstorage/src/ProcPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.cc?rev=56487&r1=56486&r2=56487&view=diff ============================================================================== --- trunk/storage/libstorage/src/ProcPart.cc (original) +++ trunk/storage/libstorage/src/ProcPart.cc Tue Mar 31 12:13:13 2009 @@ -27,19 +27,19 @@ { data.clear(); - AsciiFile file("/proc/partitions"); - const vector<string>& lines = file.lines(); + AsciiFile parts("/proc/partitions"); + parts.remove(0, 2); - for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) + for (vector<string>::const_iterator it = parts.lines().begin(); it != parts.lines().end(); ++it) { string device = extractNthWord(3, *it); - if (!device.empty() && device != "name") - { - unsigned long long sizeK; - extractNthWord(2, *it) >> sizeK; - data[device] = sizeK; - } + unsigned long long sizeK; + extractNthWord(2, *it) >> sizeK; + data[device] = sizeK; } + + for (map::const_iterator it = data.begin(); it != data.end(); ++it) + y2mil("data[" << it->first << "] -> " << it->second); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org