From 728fcb385e647951382055836aed28f361d75a45 Mon Sep 17 00:00:00 2001 From: biver Date: Sat, 22 Oct 2022 22:49:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BE=D1=82=20=D0=BB?= =?UTF-8?q?=D1=8E=D0=B1=D1=8B=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20=D0=B0=D0=BB?= =?UTF-8?q?=D1=84=D0=B0=D0=B2=D0=B8=D1=82=D0=B0=20=D0=B8=20=D1=86=D0=B8?= =?UTF-8?q?=D1=84=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/StringUtils.cpp | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/utils/StringUtils.cpp b/src/utils/StringUtils.cpp index a8d4ee3b..eb869812 100644 --- a/src/utils/StringUtils.cpp +++ b/src/utils/StringUtils.cpp @@ -128,18 +128,18 @@ size_t itemsCount2(String str, const String& separator) { return cnt; } -size_t itemsCount(String& str, const char* delim) { - size_t cnt = 0; - char* cstr = new char[str.length() + 1]; - strcpy(cstr, str.c_str()); - char* token; - while ((token = strtok_r(cstr, delim, &cstr))) { - cnt++; - // printf("%s\n", token); - } - delete[] cstr; - return cnt; -} +// size_t itemsCount(String& str, const char* delim) { +// size_t cnt = 0; +// char* cstr = new char[str.length() + 1]; +// strcpy(cstr, str.c_str()); +// char* token; +// while ((token = strtok_r(cstr, delim, &cstr))) { +// cnt++; +// // printf("%s\n", token); +// } +// delete[] cstr; +// return cnt; +// } char* stringToChar(String& str) { char* mychar = new char[str.length() + 1]; @@ -198,3 +198,12 @@ String uint64ToString(uint64_t input, uint8_t base) { } while (input); return result; } + +String cleanString(String str) { + String clearStr = ""; + const String allowedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдеёжзийклмнопрстуфхцчшщъыьэюя.!-+ "; + for (size_t i = 0; i < str.length(); i++) { + if (allowedChars.indexOf(str.charAt(i)) != -1) clearStr += str.charAt(i); + } + return clearStr; +} \ No newline at end of file