From 90dabbdb225e6c5be9ee5def817254e3aa65040c Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 1 Mar 2001 17:31:33 +0000 Subject: Reconstify variables to match iconv. 2001-03-02 Not Zed * camel-mime-utils.c (rfc2047_encode_word, rfc2047_decode_word): Reconstify variables to match iconv. * camel-search-private.c (camel_ustrstrcase): Change some assertions back into valid returns. svn path=/trunk/; revision=8452 --- camel/camel-search-private.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'camel/camel-search-private.c') diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c index a288e91ca6..a6a87c0728 100644 --- a/camel/camel-search-private.c +++ b/camel/camel-search-private.c @@ -247,8 +247,11 @@ camel_ustrstrcase (const char *haystack, const char *needle) g_return_val_if_fail (haystack != NULL, NULL); g_return_val_if_fail (needle != NULL, NULL); - g_return_val_if_fail (strlen (needle) != 0, haystack); - g_return_val_if_fail (strlen (haystack) != 0, NULL); + + if (strlen(needle) == 0) + return haystack; + if (strlen(haystack) == 0) + return NULL; puni = nuni = alloca (sizeof (unicode_char_t) * strlen (needle)); -- cgit