Fixed misleading naming "strcmp" returning gboolean: -> "compare"

diff --git a/src/libcaptive/fs/name.c b/src/libcaptive/fs/name.c
index 4a57b34..5280c99 100644 (file)
--- a/src/libcaptive/fs/name.c
+++ b/src/libcaptive/fs/name.c
@@ -166,8 +166,8 @@ PWSTR delim_RemainingName_start,delim_RemainingName_end;
  * TODO: NOT IMPLEMENTED YET.
  *
  * Compare the given filenames if they match according to the specified criteria.
- * FIXME: libcaptive implements this function currently as captive_UnicodeString_strcasecmp()
- * or captive_UnicodeString_strcmp(); How are filesystem names specific from regular strings?
+ * FIXME: libcaptive implements this function currently as captive_UnicodeString_compare_insensitive()
+ * or captive_UnicodeString_compare(); How are filesystem names specific from regular strings?
  *
  * Returns: %TRUE if @Name1 and @Name2 match.
  */
@@ -185,7 +185,7 @@ BOOLEAN FsRtlAreNamesEqual
        g_return_val_if_fail((IgnoreCase==FALSE && UpcaseTable==NULL) || IgnoreCase==TRUE,FALSE);
 
        if (IgnoreCase)
-               return captive_UnicodeString_strcasecmp(Name1,Name2);
+               return captive_UnicodeString_compare_insensitive(Name1,Name2);
        else
-               return captive_UnicodeString_strcmp    (Name1,Name2);
+               return captive_UnicodeString_compare            (Name1,Name2);
 }

diff --git a/src/libcaptive/include/captive/unicode.h b/src/libcaptive/include/captive/unicode.h
index d260ed3..d6232b8 100644 (file)
--- a/src/libcaptive/include/captive/unicode.h
+++ b/src/libcaptive/include/captive/unicode.h
@@ -86,11 +86,11 @@ PUNICODE_STRING captive_utf8_to_UnicodeString_malloc(const gchar *string_utf8);
  * Initially we create the result content from the input content but it should not harm.
  */
 const gunichar2 *captive_ucs4_to_utf16_const(const gunichar *string_ucs4) G_GNUC_CONST;
-gboolean captive_ucs2_strcmp(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2);
-gboolean captive_UnicodeString_strcmp
+gboolean captive_ucs2_compare(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2);
+gboolean captive_UnicodeString_compare
                (const UNICODE_STRING *string_a_UnicodeString,const UNICODE_STRING *string_b_UnicodeString);
-gboolean captive_ucs2_strcasecmp(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2);
-gboolean captive_UnicodeString_strcasecmp
+gboolean captive_ucs2_compare_insensitive(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2);
+gboolean captive_UnicodeString_compare_insensitive
                (const UNICODE_STRING *string_a_UnicodeString,const UNICODE_STRING *string_b_UnicodeString);
 
 /* internal: */

diff --git a/src/libcaptive/rtl/unicode.c b/src/libcaptive/rtl/unicode.c
index dcb05ca..3198002 100644 (file)
--- a/src/libcaptive/rtl/unicode.c
+++ b/src/libcaptive/rtl/unicode.c
@@ -264,7 +264,7 @@ gboolean captive_validate_AnsiString(const ANSI_STRING *string_AnsiString)
 
 
 /**
- * captive_ucs2_strcmp:
+ * captive_ucs2_compare:
  * @string_a_ucs2: First string of type #const #gunichar2 * in pure UCS-2.
  * Invalid string input is forbidden. UTF-16 encoded pairs are forbidden.
  * @string_b_ucs2: Second string of type #const #gunichar2 * in pure UCS-2.
@@ -274,7 +274,7 @@ gboolean captive_validate_AnsiString(const ANSI_STRING *string_AnsiString)
  *
  * Returns: %TRUE if @string_a_ucs2 and @string_b_ucs2 are the same.
  */
-gboolean captive_ucs2_strcmp(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2)
+gboolean captive_ucs2_compare(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2)
 {
 guint ui;
 
@@ -291,7 +291,7 @@ guint ui;
 
 
 /**
- * captive_UnicodeString_strcmp:
+ * captive_UnicodeString_compare:
  * @string_a_UnicodeString: First string of type #PUNICODE_STRING.
  * Invalid string input is forbidden.
  * @string_b_UnicodeString: Second string of type #PUNICODE_STRING.
@@ -301,7 +301,7 @@ guint ui;
  *
  * Returns: %TRUE if @string_a_UnicodeString and @string_b_UnicodeString are the same.
  */
-gboolean captive_UnicodeString_strcmp
+gboolean captive_UnicodeString_compare
                (const UNICODE_STRING *string_a_UnicodeString,const UNICODE_STRING *string_b_UnicodeString)
 {
        g_return_val_if_fail(captive_validate_UnicodeString(string_a_UnicodeString),FALSE);
@@ -309,12 +309,12 @@ gboolean captive_UnicodeString_strcmp
 
        if (string_a_UnicodeString->Length!=string_b_UnicodeString->Length)
                return FALSE;
-       return captive_ucs2_strcmp(string_a_UnicodeString->Buffer,string_b_UnicodeString->Buffer);
+       return captive_ucs2_compare(string_a_UnicodeString->Buffer,string_b_UnicodeString->Buffer);
 }
 
 
 /**
- * captive_ucs2_strcasecmp:
+ * captive_ucs2_compare_insensitive:
  * @string_a_ucs2: First string of type #const #gunichar2 * in pure UCS-2.
  * Invalid string input is forbidden. UTF-16 encoded pairs are forbidden.
  * @string_b_ucs2: Second string of type #const #gunichar2 * in pure UCS-2.
@@ -324,7 +324,7 @@ gboolean captive_UnicodeString_strcmp
  *
  * Returns: %TRUE if @string_a_ucs2 and @string_b_ucs2 are the same.
  */
-gboolean captive_ucs2_strcasecmp(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2)
+gboolean captive_ucs2_compare_insensitive(const captive_ucs2 *string_a_ucs2,const captive_ucs2 *string_b_ucs2)
 {
 guint ui;
 
@@ -341,7 +341,7 @@ guint ui;
 
 
 /**
- * captive_UnicodeString_strcasecmp:
+ * captive_UnicodeString_compare_insensitive:
  * @string_a_UnicodeString: First string of type #PUNICODE_STRING.
  * Invalid string input is forbidden.
  * @string_b_UnicodeString: Second string of type #PUNICODE_STRING.
@@ -351,7 +351,7 @@ guint ui;
  *
  * Returns: %TRUE if @string_a_UnicodeString and @string_b_UnicodeString are the same.
  */
-gboolean captive_UnicodeString_strcasecmp
+gboolean captive_UnicodeString_compare_insensitive
                (const UNICODE_STRING *string_a_UnicodeString,const UNICODE_STRING *string_b_UnicodeString)
 {
        g_return_val_if_fail(captive_validate_UnicodeString(string_a_UnicodeString),FALSE);
@@ -359,7 +359,7 @@ gboolean captive_UnicodeString_strcasecmp
 
        if (string_a_UnicodeString->Length!=string_b_UnicodeString->Length)
                return FALSE;
-       return captive_ucs2_strcasecmp(string_a_UnicodeString->Buffer,string_b_UnicodeString->Buffer);
+       return captive_ucs2_compare_insensitive(string_a_UnicodeString->Buffer,string_b_UnicodeString->Buffer);
 }