From 4c8944ece27a0c464d4f4e74a14c06bc1d5ec1cf Mon Sep 17 00:00:00 2001 From: cora32 Date: Thu, 2 Apr 2015 22:54:42 +0300 Subject: [PATCH] JP-symbols negative fix. --- finder.cpp | 26 +++----------------------- negatives.txt | 1 + version | 2 +- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/finder.cpp b/finder.cpp index d92febd..61e6823 100644 --- a/finder.cpp +++ b/finder.cpp @@ -369,40 +369,20 @@ int ContentFilter(const char *buff, int port, const char *ip, char *cp, int sz) if(buff != NULL) { int res = 0; - std::string tempString = ""; - - if(strstr(cp, "1251") != NULL) - { - tempString = toLowerStr(buff); - } - else - { -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) - tempString = toLowerStr(xcode(buff, CP_UTF8, CP_ACP).c_str()); -#else - tempString = toLowerStr(buff); -#endif - }; - - char *lBuff = new char[sz + 1]; - ZeroMemory(lBuff, sz + 1); - strcpy(lBuff, tempString.c_str()); - memset(lBuff + sz, '\0', 1); if(sz <= 500) { - res = _mainFinderFirst(lBuff, 1, port, ip, sz); + res = _mainFinderFirst(toLowerStr(buff).c_str(), 1, port, ip, sz); } else if((sz > 500 && sz <= 3500) || sz > 180000) { - res = _mainFinderFirst(lBuff, 0, port, ip, sz); + res = _mainFinderFirst(toLowerStr(buff).c_str(), 0, port, ip, sz); } else if(sz > 3500 && sz <= 180000) { - res = _mainFinderSecond(lBuff, port, ip); + res = _mainFinderSecond(toLowerStr(buff).c_str(), port, ip); }; - delete []lBuff; return res; } else return -1; diff --git a/negatives.txt b/negatives.txt index cd55b0e..3032d57 100644 --- a/negatives.txt +++ b/negatives.txt @@ -1,3 +1,4 @@ +エラー pagerror Error report 電話 diff --git a/version b/version index f7ffd3d..abb026c 100644 --- a/version +++ b/version @@ -1 +1 @@ -24B82-89C \ No newline at end of file +24B82-8B3 \ No newline at end of file