[yast-commit] r50219 - in /trunk/storage/libstorage/src: Regex.cc Regex.h

Author: aschnell Date: Wed Aug 20 03:44:35 2008 New Revision: 50219 URL: http://svn.opensuse.org/viewcvs/yast?rev=50219&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Regex.cc trunk/storage/libstorage/src/Regex.h Modified: trunk/storage/libstorage/src/Regex.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Regex.cc?rev=50219&r1=50218&r2=50219&view=diff ============================================================================== --- trunk/storage/libstorage/src/Regex.cc (original) +++ trunk/storage/libstorage/src/Regex.cc Wed Aug 20 03:44:35 2008 @@ -78,5 +78,5 @@ return ""; } -const string& Regex::ws = "[ \t]*"; -const string& Regex::number = "[0123456789]+"; +const string Regex::ws = "[ \t]*"; +const string Regex::number = "[0123456789]+"; Modified: trunk/storage/libstorage/src/Regex.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Regex.h?rev=50219&r1=50218&r2=50219&view=diff ============================================================================== --- trunk/storage/libstorage/src/Regex.h (original) +++ trunk/storage/libstorage/src/Regex.h Wed Aug 20 03:44:35 2008 @@ -7,7 +7,6 @@ */ -#include #include #include <string> @@ -20,23 +19,25 @@ { public: - Regex (const char*, int = REG_EXTENDED, unsigned int = 10); - Regex (const string&, int = REG_EXTENDED, unsigned int = 10); + Regex (const char* pattern, int cflags = REG_EXTENDED, unsigned int = 10); + Regex (const string& pattern, int cflags = REG_EXTENDED, unsigned int = 10); ~Regex (); string getPattern () const { return pattern; }; int getCflags () const { return cflags; } - bool match (const string&, int = 0) const; + bool match (const string&, int eflags = 0) const; regoff_t so (unsigned int) const; regoff_t eo (unsigned int) const; string cap (unsigned int) const; - static const string& ws; - static const string& number; + + static const string ws; + static const string number; private: + const string pattern; const int cflags; const unsigned int nm; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org