Author: aschnell Date: Thu Mar 26 11:29:17 2009 New Revision: 56416 URL: http://svn.opensuse.org/viewcvs/yast?rev=56416&view=rev Log: - replaced dupDash by boost functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmLv.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.cc?rev=56416&r1=56415&r2=56416&view=diff ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Mar 26 11:29:17 2009 @@ -29,19 +29,6 @@ using namespace std; -string dupDash(const string& s) - { - string ret(s); - string::size_type pos = ret.find("-"); - while(pos!=string::npos) - { - ret.insert(pos,1,'-'); - pos = ret.find("-",pos+2); - } - return(ret); - } - - void createPath(const string& Path_Cv) { string::size_type Pos_ii = 0; Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?rev=56416&r1=56415&r2=56416&view=diff ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Mar 26 11:29:17 2009 @@ -18,7 +18,6 @@ bool checkNormalFile(const string& Path_Cv); bool checkDir(const string& Path_Cv); -string dupDash(const string& s); string extractNthWord(int Num_iv, const string& Line_Cv, bool GetRest_bi = false); std::list<string> splitString( const string& s, const string& delChars=" \t\n", bool multipleDelim=true, bool skipEmpty=true, Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?rev=56416&r1=56415&r2=56416&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Thu Mar 26 11:29:17 2009 @@ -3,6 +3,7 @@ */ #include <sstream> +#include #include "y2storage/LvmLv.h" #include "y2storage/LvmVg.h" @@ -20,7 +21,7 @@ LvmLv::LvmLv(const LvmVg& d, const string& name, const string& origi, unsigned long le, const string& uuid, const string& stat, const string& alloc) - : Dm( d, dupDash(d.name())+"-"+dupDash(name) ), + : Dm(d, makeDmTableName(d.name(), name)), origin(origi) { init( name ); @@ -37,7 +38,7 @@ LvmLv::LvmLv(const LvmVg& d, const string& name, const string& origi, unsigned long le, unsigned str) - : Dm( d, dupDash(d.name())+"-"+dupDash(name) ), + : Dm(d, makeDmTableName(d.name(), name)), origin(origi) { init( name ); @@ -45,7 +46,7 @@ calcSize(); stripe = str; fs = detected_fs = FSNONE; - alt_names.push_back( "/dev/mapper/" + dupDash(cont->name()) + "-" + dupDash(name) ); + alt_names.push_back("/dev/mapper/" + getTableName()); y2deb("constructed lvm lv dev:" << dev << " vg:" << cont->name() << " origin:" << origin); } @@ -63,6 +64,14 @@ } + string + LvmLv::makeDmTableName(const string& vg_name, const string& lv_name) + { + return boost::replace_all_copy(vg_name, "-", "--") + "-" + + boost::replace_all_copy(lv_name, "-", "--"); + } + + void LvmLv::init( const string& name ) { nm = name; Modified: trunk/storage/libstorage/src/LvmLv.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.h?rev=56416&r1=56415&r2=56416&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmLv.h (original) +++ trunk/storage/libstorage/src/LvmLv.h Thu Mar 26 11:29:17 2009 @@ -1,8 +1,6 @@ #ifndef LVM_LV_H #define LVM_LV_H -#include <map> - #include "y2storage/Dm.h" namespace storage @@ -47,8 +45,9 @@ void logDifference( const LvmLv& d ) const; protected: + static string makeDmTableName(const string& vg_name, const string& lv_name); void init( const string& name ); - virtual const string shortPrintedName() const { return( "Lv" ); } + virtual const string shortPrintedName() const { return "Lv"; } LvmLv& operator=( const LvmLv& ); string origin; // only for snapshots, empty otherwise -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org