Removed __PHYSFS_stricmpASCII functions.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 11 Aug 2017 01:45:29 -0400
changeset 1558 f910eacfda41
parent 1557 723eea9df40d
child 1559 aaee2b83291f
Removed __PHYSFS_stricmpASCII functions. Nothing was using them, except one OS/2 thing that could live with stricmp.
src/physfs_internal.h
src/physfs_platform_os2.c
src/physfs_unicode.c
--- a/src/physfs_internal.h	Fri Aug 11 01:29:38 2017 -0400
+++ b/src/physfs_internal.h	Fri Aug 11 01:45:29 2017 -0400
@@ -291,18 +291,6 @@
 )
 
 /*
- * stricmp() that guarantees to only work with low ASCII. The C runtime
- *  stricmp() might try to apply a locale/codepage/etc, which we don't want.
- */
-int __PHYSFS_stricmpASCII(const char *s1, const char *s2);
-
-/*
- * strnicmp() that guarantees to only work with low ASCII. The C runtime
- *  strnicmp() might try to apply a locale/codepage/etc, which we don't want.
- */
-int __PHYSFS_strnicmpASCII(const char *s1, const char *s2, PHYSFS_uint32 l);
-
-/*
  * Like strdup(), but uses the current PhysicsFS allocator.
  */
 char *__PHYSFS_strdup(const char *str);
--- a/src/physfs_platform_os2.c	Fri Aug 11 01:29:38 2017 -0400
+++ b/src/physfs_platform_os2.c	Fri Aug 11 01:45:29 2017 -0400
@@ -202,8 +202,8 @@
             {
                 int cmp;
                 char *utf8 = cvtCodepageToUtf8(fb.achName);
-                if (!utf8) /* ugh, maybe we'll get lucky and it's ASCII */
-                    cmp = __PHYSFS_stricmpASCII(utf8, fname);
+                if (!utf8) /* ugh, maybe we'll get lucky with the C runtime. */
+                    cmp = stricmp(utf8, fname);
                 else
                 {
                     cmp = PHYSFS_utf8stricmp(utf8, fname);
--- a/src/physfs_unicode.c	Fri Aug 11 01:29:38 2017 -0400
+++ b/src/physfs_unicode.c	Fri Aug 11 01:45:29 2017 -0400
@@ -533,46 +533,5 @@
     return 0;
 } /* PHYSFS_utf8stricmp */
 
-
-int __PHYSFS_stricmpASCII(const char *str1, const char *str2)
-{
-    while (1)
-    {
-        const char ch1 = *(str1++);
-        const char ch2 = *(str2++);
-        const char cp1 = ((ch1 >= 'A') && (ch1 <= 'Z')) ? (ch1+32) : ch1;
-        const char cp2 = ((ch2 >= 'A') && (ch2 <= 'Z')) ? (ch2+32) : ch2;
-        if (cp1 < cp2)
-            return -1;
-        else if (cp1 > cp2)
-            return 1;
-        else if (cp1 == 0)  /* they're both null chars? */
-            break;
-    } /* while */
-
-    return 0;
-} /* __PHYSFS_stricmpASCII */
-
-
-int __PHYSFS_strnicmpASCII(const char *str1, const char *str2, PHYSFS_uint32 n)
-{
-    while (n-- > 0)
-    {
-        const char ch1 = *(str1++);
-        const char ch2 = *(str2++);
-        const char cp1 = ((ch1 >= 'A') && (ch1 <= 'Z')) ? (ch1+32) : ch1;
-        const char cp2 = ((ch2 >= 'A') && (ch2 <= 'Z')) ? (ch2+32) : ch2;
-        if (cp1 < cp2)
-            return -1;
-        else if (cp1 > cp2)
-            return 1;
-        else if (cp1 == 0)  /* they're both null chars? */
-            return 0;
-    } /* while */
-
-    return 0;
-} /* __PHYSFS_strnicmpASCII */
-
-
 /* end of physfs_unicode.c ... */