Просмотр исходного кода

Renamed __PHYSFS_utf8strcasecmp() to __PHYSFS_utf8stricmp().

This matches style of other function names we use.
Ryan C. Gordon 14 лет назад
Родитель
Сommit
53fe6d360a
3 измененных файлов с 5 добавлено и 6 удалено
  1. 1 1
      src/archiver_unpacked.c
  2. 2 3
      src/physfs_internal.h
  3. 2 2
      src/physfs_unicode.c

+ 1 - 1
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)

+ 2 - 3
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);

+ 2 - 2
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)