crnlib: introduce crnlib_stricmp and crnlib_strnicmp

crnlib/crn_dynamic_string.cpp

@@ -71,7 +71,7 @@ void dynamic_string::optimize() {
 int dynamic_string::compare(const char* p, bool case_sensitive) const {
   CRNLIB_ASSERT(p);
 
-  const int result = (case_sensitive ? strcmp : crn_stricmp)(get_ptr_priv(), p);
+  const int result = (case_sensitive ? strcmp : crnlib_stricmp)(get_ptr_priv(), p);
 
   if (result < 0)
     return -1;
@@ -379,7 +379,7 @@ int dynamic_string::find_left(const char* p, bool case_sensitive) const {
   const int p_len = (int)strlen(p);
 
   for (int i = 0; i <= (m_len - p_len); i++)
-    if ((case_sensitive ? strncmp : _strnicmp)(p, &m_pStr[i], p_len) == 0)
+    if ((case_sensitive ? strncmp : crnlib_strnicmp)(p, &m_pStr[i], p_len) == 0)
       return i;
 
   return -1;
@@ -416,7 +416,7 @@ int dynamic_string::find_right(const char* p, bool case_sensitive) const {
   const int p_len = (int)strlen(p);
 
   for (int i = m_len - p_len; i >= 0; i--)
-    if ((case_sensitive ? strncmp : _strnicmp)(p, &m_pStr[i], p_len) == 0)
+    if ((case_sensitive ? strncmp : crnlib_strnicmp)(p, &m_pStr[i], p_len) == 0)
       return i;
 
   return -1;

crnlib/crn_platform.h

@@ -82,9 +82,12 @@ char* crnlib_strnlwr(char* p, size_t n);
 char* crnlib_strnupr(char* p, size_t n);
 #endif
 
-#if !defined(_WIN32)
-#define _stricmp strcasecmp
-#define _strnicmp strncasecmp
+#if defined(_WIN32)
+#define crnlib_stricmp _stricmp
+#define crnlib_strnicmp _strnicmp
+#else
+#define crnlib_stricmp strcasecmp
+#define crnlib_strnicmp strncasecmp
 #endif
 
 inline bool crnlib_is_little_endian() {

crnlib/crn_resample_filters.cpp

@@ -296,7 +296,7 @@ const int g_num_resample_filters = sizeof(g_resample_filters) / sizeof(g_resampl
 
 int find_resample_filter(const char* pName) {
   for (int i = 0; i < g_num_resample_filters; i++)
-    if (_stricmp(pName, g_resample_filters[i].name) == 0)
+    if (crnlib_stricmp(pName, g_resample_filters[i].name) == 0)
       return i;
   return cInvalidIndex;
 }

crnlib/crn_strutils.cpp

@@ -16,10 +16,6 @@ char* crn_strdup(const char* pStr) {
   return p;
 }
 
-int crn_stricmp(const char* p, const char* q) {
-  return _stricmp(p, q);
-}
-
 char* strcpy_safe(char* pDst, uint dst_len, const char* pSrc) {
   CRNLIB_ASSERT(pDst && pSrc && dst_len);
   if (!dst_len)
@@ -310,10 +306,10 @@ bool string_to_bool(const char* p, bool& value) {
 
   value = false;
 
-  if (_stricmp(p, "false") == 0)
+  if (crnlib_stricmp(p, "false") == 0)
     return true;
 
-  if (_stricmp(p, "true") == 0) {
+  if (crnlib_stricmp(p, "true") == 0) {
     value = true;
     return true;
   }

crnlib/crn_strutils.h

@@ -10,7 +10,6 @@
 
 namespace crnlib {
 char* crn_strdup(const char* pStr);
-int crn_stricmp(const char* p, const char* q);
 
 char* strcpy_safe(char* pDst, uint dst_len, const char* pSrc);
 

crnlib/crn_value.h

@@ -166,10 +166,10 @@ class value {
       return false;
     }
 
-    if (_stricmp(p, "false") == 0) {
+    if (crnlib_stricmp(p, "false") == 0) {
       set_bool(false);
       return true;
-    } else if (_stricmp(p, "true") == 0) {
+    } else if (crnlib_stricmp(p, "true") == 0) {
       set_bool(true);
       return true;
     }

crunch/crunch.cpp

@@ -1137,7 +1137,7 @@ class crunch {
 static bool check_for_option(int argc, char* argv[], const char* pOption) {
   for (int i = 1; i < argc; i++) {
     if ((argv[i][0] == '/') || (argv[i][0] == '-')) {
-      if (crn_stricmp(&argv[i][1], pOption) == 0)
+      if (crnlib_stricmp(&argv[i][1], pOption) == 0)
         return true;
     }
   }