Author: aschnell Date: Wed Aug 20 11:38:49 2008 New Revision: 50227 URL: http://svn.opensuse.org/viewcvs/yast?rev=50227&view=rev Log: - renamed match_string -> match_regex (because that's what it does) Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageTypes.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=50227&r1=50226&r2=50227&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Aug 20 11:38:49 2008 @@ -2182,7 +2182,7 @@ list<string> opts = splitString( vol->getFstabOption(), "," ); for( list<string>::const_iterator i=l.begin(); i!=l.end(); i++ ) { - opts.remove_if( match_string( *i )); + opts.remove_if(match_regex(*i)); } ret = vol->changeFstabOptions( mergeString( opts, "," ) ); } Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTypes.h?rev=50227&r1=50226&r2=50227&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Wed Aug 20 11:38:49 2008 @@ -132,7 +132,14 @@ struct match_string { - match_string(const Regex& t) : r(t) {} + match_string(const string& t) : val(t) {} + bool operator()(const string&s) { return s == val; } + const string& val; + }; + +struct match_regex + { + match_regex(const Regex& t) : r(t) {} bool operator()(const string&s) { return r.match(s); } const Regex& r; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org