Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Renamed __PHYSFS_utf8strcasecmp() to __PHYSFS_utf8stricmp().
This matches style of other function names we use.
  • Loading branch information
icculus committed Mar 22, 2012
1 parent 4aec77e commit 53fe6d3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/archiver_unpacked.c
Expand Up @@ -199,7 +199,7 @@ static UNPKentry *findEntry(const UNPKinfo *info, const char *name)
while (lo <= hi)
{
middle = lo + ((hi - lo) / 2);
rc = __PHYSFS_utf8strcasecmp(name, a[middle].name);
rc = __PHYSFS_utf8stricmp(name, a[middle].name);
if (rc == 0) /* found it! */
return &a[middle];
else if (rc > 0)
Expand Down
5 changes: 2 additions & 3 deletions src/physfs_internal.h
Expand Up @@ -350,11 +350,10 @@ void __PHYSFS_sort(void *entries, PHYSFS_uint32 max,
* algorithms possible, if not entirely sane. Most cases should treat the
* return value as "equal" or "not equal".
*/
/* !!! FIXME: why is this casecmp, when everyone else is icmp? */
int __PHYSFS_utf8strcasecmp(const char *s1, const char *s2);
int __PHYSFS_utf8stricmp(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().
*/
int __PHYSFS_utf8strnicmp(const char *s1, const char *s2, PHYSFS_uint32 l);
Expand Down
4 changes: 2 additions & 2 deletions src/physfs_unicode.c
Expand Up @@ -455,7 +455,7 @@ static int utf8codepointcmp(const PHYSFS_uint32 cp1, const PHYSFS_uint32 cp2)
} /* utf8codepointcmp */


int __PHYSFS_utf8strcasecmp(const char *str1, const char *str2)
int __PHYSFS_utf8stricmp(const char *str1, const char *str2)
{
while (1)
{
Expand All @@ -466,7 +466,7 @@ int __PHYSFS_utf8strcasecmp(const char *str1, const char *str2)
} /* while */

return 0;
} /* __PHYSFS_utf8strcasecmp */
} /* __PHYSFS_utf8stricmp */


int __PHYSFS_utf8strnicmp(const char *str1, const char *str2, PHYSFS_uint32 n)
Expand Down

0 comments on commit 53fe6d3

Please sign in to comment.