Skip to content
Permalink
Browse files
Removed __PHYSFS_stricmpASCII functions.
Nothing was using them, except one OS/2 thing that could live with stricmp.
  • Loading branch information
icculus committed Aug 11, 2017
1 parent 78c1a98 commit b082bc3432561a9b39d86f4e64413c617f1bd8da
Showing with 2 additions and 55 deletions.
  1. +0 −12 src/physfs_internal.h
  2. +2 −2 src/physfs_platform_os2.c
  3. +0 −41 src/physfs_unicode.c
@@ -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.
*/
@@ -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);
@@ -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 ... */

0 comments on commit b082bc3

Please sign in to comment.