From 53fe6d360a5c59b2f186acb374cdf425d610fc42 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 22 Mar 2012 03:02:50 -0400 Subject: [PATCH] Renamed __PHYSFS_utf8strcasecmp() to __PHYSFS_utf8stricmp(). This matches style of other function names we use. --- src/archiver_unpacked.c | 2 +- src/physfs_internal.h | 5 ++--- src/physfs_unicode.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/archiver_unpacked.c b/src/archiver_unpacked.c index bc0c84f7..b059da30 100644 --- a/src/archiver_unpacked.c +++ b/src/archiver_unpacked.c @@ -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) diff --git a/src/physfs_internal.h b/src/physfs_internal.h index 73dd13ef..f1f18c32 100644 --- a/src/physfs_internal.h +++ b/src/physfs_internal.h @@ -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); diff --git a/src/physfs_unicode.c b/src/physfs_unicode.c index 1fadf324..628c8992 100644 --- a/src/physfs_unicode.c +++ b/src/physfs_unicode.c @@ -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) { @@ -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)