From f9218423b90a8effafba323abb088cebba34fb25 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 6 Nov 2009 19:50:47 +0100 Subject: utils: renamed stringFoundInStringArray() No CamelCase. Use bool instead of int. Make both arguments mandatory. --- src/utils.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/utils.c') diff --git a/src/utils.c b/src/utils.c index 933a70a8..ed8ef6c1 100644 --- a/src/utils.c +++ b/src/utils.c @@ -132,13 +132,15 @@ int set_nonblocking(int fd) #endif } -int stringFoundInStringArray(const char *const*array, const char *suffix) +bool +string_array_contains(const char *const* haystack, const char *needle) { - while (array && *array) { - if (g_ascii_strcasecmp(*array, suffix) == 0) - return 1; - array++; - } + assert(haystack != NULL); + assert(needle != NULL); + + for (; *haystack != NULL; ++haystack) + if (g_ascii_strcasecmp(*haystack, needle) == 0) + return true; - return 0; + return false; } -- cgit v1.2.3