luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gstrfuncs: Add g_strv_contains()

Browse Source 
Includes unit tests.

https://bugzilla.gnome.org/show_bug.cgi?id=685880
This commit is contained in:
Xavier Claessens 2013-04-15 14:54:31 +02:00 committed by Philip Withnall
parent 3f5a78a248
commit 71944b1bfd
4 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/glib/glib-sections.txt
View File

@ -1380,6 +1380,7 @@ g_strconcat
g_strjoin g_strjoin
g_strjoinv g_strjoinv
g_strv_length g_strv_length
g_strv_contains
<SUBSECTION> <SUBSECTION>
g_strerror g_strerror

27
glib/gstrfuncs.c
View File

@ -3077,3 +3077,30 @@ one_matched:
return matched; return matched;
} }
/**
* g_strv_contains:
* @strv: a %NULL-terminated array of strings
* @str: a string
*
* Checks if @strv contains @str. @strv must not be %NULL.
*
* Returns: %TRUE if @str is an element of @strv, according to g_str_equal().
*
* Since: 2.44
*/
gboolean
g_strv_contains (const gchar * const *strv,
const gchar *str)
{
g_return_val_if_fail (strv != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE);
for (; *strv != NULL; strv++)
{
if (g_str_equal (str, *strv))
return TRUE;
}
return FALSE;
}

4
glib/gstrfuncs.h
View File

@ -301,6 +301,10 @@ gboolean g_str_match_string (const g
const gchar *potential_hit, const gchar *potential_hit,
gboolean accept_alternates); gboolean accept_alternates);
GLIB_AVAILABLE_IN_2_44
gboolean g_strv_contains (const gchar * const *strv,
const gchar *str);
G_END_DECLS G_END_DECLS
#endif /* __G_STRFUNCS_H__ */ #endif /* __G_STRFUNCS_H__ */

19
glib/tests/strfuncs.c
View File

@ -1461,6 +1461,24 @@ test_transliteration (void)
g_free (out); g_free (out);
} }
static void
test_strv_contains (void)
{
static const gchar *strv_simple[] = { "hello", "there", NULL };
static const gchar *strv_dupe[] = { "dupe", "dupe", NULL };
static const gchar *strv_empty[] = { NULL };
g_assert_true (g_strv_contains (strv_simple, "hello"));
g_assert_true (g_strv_contains (strv_simple, "there"));
g_assert_false (g_strv_contains (strv_simple, "non-existent"));
g_assert_false (g_strv_contains (strv_simple, ""));
g_assert_true (g_strv_contains (strv_dupe, "dupe"));
g_assert_false (g_strv_contains (strv_empty, "empty!"));
g_assert_false (g_strv_contains (strv_empty, ""));
}
int int
main (int argc, main (int argc,
char *argv[]) char *argv[])
@ -1496,6 +1514,7 @@ main (int argc,
g_test_add_func ("/strfuncs/strsignal", test_strsignal); g_test_add_func ("/strfuncs/strsignal", test_strsignal);
g_test_add_func ("/strfuncs/strup", test_strup); g_test_add_func ("/strfuncs/strup", test_strup);
g_test_add_func ("/strfuncs/transliteration", test_transliteration); g_test_add_func ("/strfuncs/transliteration", test_transliteration);
g_test_add_func ("/strfuncs/strv-contains", test_strv_contains);
return g_test_run(); return g_test_run();
} }