Fix typo: Seperate -> Separate.

[freerainbowtables] / Client Applications / rcracki_mt / Public.cpp

diff --git a/Client Applications/rcracki_mt/Public.cpp b/Client Applications/rcracki_mt/Public.cpp
index 959e691b8c68e2fde3a21dfa2f7002f5f3068562..3c66a5f3bc642349315da7688dd0cfac67347a80 100644 (file)
--- a/Client Applications/rcracki_mt/Public.cpp
+++ b/Client Applications/rcracki_mt/Public.cpp
@@ -23,7 +23,7 @@
  */\r
 \r
 #if defined(_WIN32) && !defined(__GNUC__)\r
-       #pragma warning(disable : 4786 4267 4018)\r
+       #pragma warning(disable : 4786)\r
 #endif\r
 \r
 #include "Public.h"\r
@@ -44,8 +44,8 @@
  \r
        struct timezone\r
        {\r
-               int  tz_minuteswest; /* minutes W of Greenwich */\r
-               int  tz_dsttime;     /* type of dst correction */\r
+               int tz_minuteswest; /* minutes W of Greenwich */\r
+               int tz_dsttime;     /* type of dst correction */\r
        };\r
  \r
        int gettimeofday(struct timeval *tv, struct timezone *tz)\r
@@ -153,8 +153,9 @@ string TrimString(string s)
 \r
        while (s.size() > 0)\r
        {\r
-               if (s[s.size() - 1] == ' ' || s[s.size() - 1] == '\t')\r
-                       s = s.substr(0, s.size() - 1);\r
+               if (s[s.size() - 1] == ' ' || s[s.size() - 1] == '\t' ||\r
+                   s[s.size() - 1] == '\r' || s[s.size() - 1] == '\n')\r
+                       s.resize(s.size() - 1);\r
                else\r
                        break;\r
        }\r
@@ -171,15 +172,15 @@ bool GetHybridCharsets(string sCharset, vector<tCharset>& vCharset)
        string::size_type nStart = (int) sCharset.rfind('(');\r
        string sChar = sCharset.substr(nStart + 1, nEnd - nStart - 1);\r
        vector<string> vParts;\r
-       SeperateString(sChar, ",", vParts);\r
+       SeparateString(sChar, ",", vParts);\r
        for(uint32 i = 0; i < vParts.size(); i++)\r
        {\r
                tCharset stCharset;\r
                vector<string> vParts2;\r
-               SeperateString(vParts[i], "#", vParts2);\r
+               SeparateString(vParts[i], "#", vParts2);\r
                stCharset.sName = vParts2[0];\r
                vector<string> vParts3;\r
-               SeperateString(vParts2[1], "-", vParts3);\r
+               SeparateString(vParts2[1], "-", vParts3);\r
                stCharset.nPlainLenMin = atoi(vParts3[0].c_str());\r
                stCharset.nPlainLenMax = atoi(vParts3[1].c_str());\r
                vCharset.push_back(stCharset);\r
@@ -250,21 +251,20 @@ bool ReadLinesFromFile(string sPathName, vector<string>& vLine)
                content += "\n";\r
                delete [] data;\r
 \r
-               unsigned int i;\r
-               for (i = 0; i < content.size(); i++)\r
-               {\r
-                       if (content[i] == '\r')\r
-                               content[i] = '\n';\r
-               }\r
+               string::iterator n = content.begin();\r
+               string::iterator line_end;\r
+               for ( ;; ) {\r
+                       line_end = find(n, content.end(), '\n');\r
 \r
-               string::size_type n;\r
-               while ((n = content.find("\n", 0)) != string::npos)\r
-               {\r
-                       string line = content.substr(0, n);\r
+                       string line(n, line_end);\r
                        line = TrimString(line);\r
                        if (line != "")\r
                                vLine.push_back(line);\r
-                       content = content.substr(n + 1);\r
+\r
+                       if (line_end == content.end()) {\r
+                               break;\r
+                       }\r
+                       n = line_end + 1;\r
                }\r
 \r
                fclose(file);\r
@@ -289,7 +289,7 @@ bool writeResultLineToFile(string sOutputFile, string sHash, string sPlain, stri
                return false;\r
 }\r
 \r
-bool SeperateString(string s, string sSeperator, vector<string>& vPart)\r
+bool SeparateString(string s, string sSeperator, vector<string>& vPart)\r
 {\r
        vPart.clear();\r
 \r