From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: NOTICE (TYPE NAME CONSOLIDATION) Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8 --- src/lib/util/corestr.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/util/corestr.cpp') diff --git a/src/lib/util/corestr.cpp b/src/lib/util/corestr.cpp index 7daad5cc0cb..ed9c8e77b0a 100644 --- a/src/lib/util/corestr.cpp +++ b/src/lib/util/corestr.cpp @@ -22,8 +22,8 @@ int core_stricmp(const char *s1, const char *s2) { for (;;) { - int c1 = tolower((UINT8)*s1++); - int c2 = tolower((UINT8)*s2++); + int c1 = tolower((uint8_t)*s1++); + int c2 = tolower((uint8_t)*s2++); if (c1 == 0 || c1 != c2) return c1 - c2; } @@ -39,8 +39,8 @@ int core_strnicmp(const char *s1, const char *s2, size_t n) size_t i; for (i = 0; i < n; i++) { - int c1 = tolower((UINT8)*s1++); - int c2 = tolower((UINT8)*s2++); + int c1 = tolower((uint8_t)*s1++); + int c2 = tolower((uint8_t)*s2++); if (c1 == 0 || c1 != c2) return c1 - c2; } @@ -166,7 +166,7 @@ std::string strtrimspace(std::string& str) int start = 0; for (auto & elem : str) { - if (!isspace(UINT8(elem))) break; + if (!isspace(uint8_t(elem))) break; start++; } int end = str.length(); @@ -174,7 +174,7 @@ std::string strtrimspace(std::string& str) { for (size_t i = str.length() - 1; i > 0; i--) { - if (!isspace(UINT8(str[i]))) break; + if (!isspace(uint8_t(str[i]))) break; end--; } } -- cgit v1.2.3-70-g09d2