diff options
author | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-08-21 12:35:49 +0000 |
---|---|---|
committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2000-08-21 12:35:49 +0000 |
commit | ba6c137e8ae452ce05a4f5536ea61f5b7a25dcb7 (patch) | |
tree | 7c883be7408cc6988c44f14c0a2dc7b58b4be586 | |
parent | 48766adbd4cd2bf75eb30fd82ad7ad19b7107349 (diff) | |
download | nautilus-ba6c137e8ae452ce05a4f5536ea61f5b7a25dcb7.tar.gz |
Add a case insensitive version of nautilus_str_is_equal.
* libnautilus-extensions/nautilus-string.c:
(nautilus_istr_is_equal), (nautilus_self_check_string):
* libnautilus-extensions/nautilus-string.h:
Add a case insensitive version of nautilus_str_is_equal.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | libnautilus-extensions/nautilus-string.c | 17 | ||||
-rw-r--r-- | libnautilus-extensions/nautilus-string.h | 2 | ||||
-rw-r--r-- | libnautilus-private/nautilus-string.c | 17 | ||||
-rw-r--r-- | libnautilus-private/nautilus-string.h | 2 |
5 files changed, 45 insertions, 0 deletions
@@ -1,6 +1,13 @@ 2000-08-21 Ramiro Estrugo <ramiro@eazel.com> * libnautilus-extensions/nautilus-string.c: + (nautilus_istr_is_equal), (nautilus_self_check_string): + * libnautilus-extensions/nautilus-string.h: + Add a case insensitive version of nautilus_str_is_equal. + +2000-08-21 Ramiro Estrugo <ramiro@eazel.com> + + * libnautilus-extensions/nautilus-string.c: (nautilus_str_count_characters), (nautilus_self_check_string): * libnautilus-extensions/nautilus-string.h: New function to count the occurance of a character in a string. diff --git a/libnautilus-extensions/nautilus-string.c b/libnautilus-extensions/nautilus-string.c index c5b02c2c8..9724db7fd 100644 --- a/libnautilus-extensions/nautilus-string.c +++ b/libnautilus-extensions/nautilus-string.c @@ -69,6 +69,12 @@ nautilus_str_is_equal (const char *string_a, const char *string_b) return (nautilus_strcmp (string_a, string_b) == 0); } +gboolean +nautilus_istr_is_equal (const char *string_a, const char *string_b) +{ + return (nautilus_strcasecmp (string_a, string_b) == 0); +} + int nautilus_str_compare (gconstpointer string_a, gconstpointer string_b) { @@ -760,6 +766,17 @@ nautilus_self_check_string (void) NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "foo"), TRUE); NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "bar"), FALSE); + /* nautilus_istr_is_equal */ + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, NULL), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", NULL), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "foo"), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "bar"), FALSE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("Foo", "foo"), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "Foo"), TRUE); + /* nautilus_str_count_characters */ NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, 'x'), 0); NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", 'x'), 0); diff --git a/libnautilus-extensions/nautilus-string.h b/libnautilus-extensions/nautilus-string.h index d3ed9cda7..22ac6bbd1 100644 --- a/libnautilus-extensions/nautilus-string.h +++ b/libnautilus-extensions/nautilus-string.h @@ -58,6 +58,8 @@ int nautilus_istr_compare (gconstpointer string_a, gboolean nautilus_str_is_empty (const char *string_or_null); gboolean nautilus_str_is_equal (const char *string_a, const char *string_b); +gboolean nautilus_istr_is_equal (const char *string_a, + const char *string_b); gboolean nautilus_str_has_prefix (const char *target, const char *prefix); char * nautilus_str_get_prefix (const char *source, diff --git a/libnautilus-private/nautilus-string.c b/libnautilus-private/nautilus-string.c index c5b02c2c8..9724db7fd 100644 --- a/libnautilus-private/nautilus-string.c +++ b/libnautilus-private/nautilus-string.c @@ -69,6 +69,12 @@ nautilus_str_is_equal (const char *string_a, const char *string_b) return (nautilus_strcmp (string_a, string_b) == 0); } +gboolean +nautilus_istr_is_equal (const char *string_a, const char *string_b) +{ + return (nautilus_strcasecmp (string_a, string_b) == 0); +} + int nautilus_str_compare (gconstpointer string_a, gconstpointer string_b) { @@ -760,6 +766,17 @@ nautilus_self_check_string (void) NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "foo"), TRUE); NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "bar"), FALSE); + /* nautilus_istr_is_equal */ + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, NULL), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", NULL), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "foo"), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "bar"), FALSE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("Foo", "foo"), TRUE); + NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "Foo"), TRUE); + /* nautilus_str_count_characters */ NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, 'x'), 0); NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", 'x'), 0); diff --git a/libnautilus-private/nautilus-string.h b/libnautilus-private/nautilus-string.h index d3ed9cda7..22ac6bbd1 100644 --- a/libnautilus-private/nautilus-string.h +++ b/libnautilus-private/nautilus-string.h @@ -58,6 +58,8 @@ int nautilus_istr_compare (gconstpointer string_a, gboolean nautilus_str_is_empty (const char *string_or_null); gboolean nautilus_str_is_equal (const char *string_a, const char *string_b); +gboolean nautilus_istr_is_equal (const char *string_a, + const char *string_b); gboolean nautilus_str_has_prefix (const char *target, const char *prefix); char * nautilus_str_get_prefix (const char *source, |