From b082bc3432561a9b39d86f4e64413c617f1bd8da Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 11 Aug 2017 01:45:29 -0400 Subject: [PATCH] Removed __PHYSFS_stricmpASCII functions. Nothing was using them, except one OS/2 thing that could live with stricmp. --- src/physfs_internal.h | 12 ------------ src/physfs_platform_os2.c | 4 ++-- src/physfs_unicode.c | 41 --------------------------------------- 3 files changed, 2 insertions(+), 55 deletions(-) diff --git a/src/physfs_internal.h b/src/physfs_internal.h index 337b44c..d0585d4 100644 --- a/src/physfs_internal.h +++ b/src/physfs_internal.h @@ -290,18 +290,6 @@ void __PHYSFS_sort(void *entries, size_t max, ((s) < (__PHYSFS_UI64(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ ) -/* - * 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. */ diff --git a/src/physfs_platform_os2.c b/src/physfs_platform_os2.c index fbfa39d..dbbb20e 100644 --- a/src/physfs_platform_os2.c +++ b/src/physfs_platform_os2.c @@ -202,8 +202,8 @@ static char *cvtPathToCorrectCase(char *buf) { 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); diff --git a/src/physfs_unicode.c b/src/physfs_unicode.c index 4fd9e59..2689fa9 100644 --- a/src/physfs_unicode.c +++ b/src/physfs_unicode.c @@ -533,46 +533,5 @@ int PHYSFS_utf8stricmp(const char *str1, const char *str2) 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 ... */