Renamed __PHYSFS_utf8strcasecmp() to __PHYSFS_utf8stricmp().

This matches style of other function names we use.
This commit is contained in:
Ryan C. Gordon 2012-03-22 03:02:50 -04:00
parent 4aec77e618
commit 53fe6d360a
3 changed files with 5 additions and 6 deletions

View File

@ -199,7 +199,7 @@ static UNPKentry *findEntry(const UNPKinfo *info, const char *name)
while (lo <= hi) while (lo <= hi)
{ {
middle = lo + ((hi - lo) / 2); middle = lo + ((hi - lo) / 2);
rc = __PHYSFS_utf8strcasecmp(name, a[middle].name); rc = __PHYSFS_utf8stricmp(name, a[middle].name);
if (rc == 0) /* found it! */ if (rc == 0) /* found it! */
return &a[middle]; return &a[middle];
else if (rc > 0) else if (rc > 0)

View File

@ -350,11 +350,10 @@ void __PHYSFS_sort(void *entries, PHYSFS_uint32 max,
* algorithms possible, if not entirely sane. Most cases should treat the * algorithms possible, if not entirely sane. Most cases should treat the
* return value as "equal" or "not equal". * return value as "equal" or "not equal".
*/ */
/* !!! FIXME: why is this casecmp, when everyone else is icmp? */ int __PHYSFS_utf8stricmp(const char *s1, const char *s2);
int __PHYSFS_utf8strcasecmp(const char *s1, const char *s2);
/* /*
* This works like __PHYSFS_utf8strcasecmp(), but takes a character (NOT BYTE * This works like __PHYSFS_utf8stricmp(), but takes a character (NOT BYTE
* COUNT) argument, like strcasencmp(). * COUNT) argument, like strcasencmp().
*/ */
int __PHYSFS_utf8strnicmp(const char *s1, const char *s2, PHYSFS_uint32 l); int __PHYSFS_utf8strnicmp(const char *s1, const char *s2, PHYSFS_uint32 l);

View File

@ -455,7 +455,7 @@ static int utf8codepointcmp(const PHYSFS_uint32 cp1, const PHYSFS_uint32 cp2)
} /* utf8codepointcmp */ } /* utf8codepointcmp */
int __PHYSFS_utf8strcasecmp(const char *str1, const char *str2) int __PHYSFS_utf8stricmp(const char *str1, const char *str2)
{ {
while (1) while (1)
{ {
@ -466,7 +466,7 @@ int __PHYSFS_utf8strcasecmp(const char *str1, const char *str2)
} /* while */ } /* while */
return 0; return 0;
} /* __PHYSFS_utf8strcasecmp */ } /* __PHYSFS_utf8stricmp */
int __PHYSFS_utf8strnicmp(const char *str1, const char *str2, PHYSFS_uint32 n) int __PHYSFS_utf8strnicmp(const char *str1, const char *str2, PHYSFS_uint32 n)