Commit 8e96b44f 8e96b44ffde18c9135dc5e694aea0e4e1a6a86bb by Sergey Poznyakoff

Rename mu_strcasestr to mu_c_strcasestr.

* include/mailutils/cstr.h (mu_strcasestr): Rename to mu_c_strcasestr.
* libmailutils/string/cstrcasestr.c: Likewise. All uses changed.
1 parent 1c4cec9b
...@@ -388,7 +388,7 @@ util_parse_ctime_date (const char *date, time_t * timep) ...@@ -388,7 +388,7 @@ util_parse_ctime_date (const char *date, time_t * timep)
388 char * 388 char *
389 util_strcasestr (const char *haystack, const char *needle) 389 util_strcasestr (const char *haystack, const char *needle)
390 { 390 {
391 return mu_strcasestr (haystack, needle); 391 return mu_c_strcasestr (haystack, needle);
392 } 392 }
393 393
394 struct 394 struct
......
...@@ -27,7 +27,7 @@ int mu_strupper (char *); ...@@ -27,7 +27,7 @@ int mu_strupper (char *);
27 27
28 int mu_c_strcasecmp (const char *a, const char *b); 28 int mu_c_strcasecmp (const char *a, const char *b);
29 int mu_c_strncasecmp (const char *a, const char *b, size_t n); 29 int mu_c_strncasecmp (const char *a, const char *b, size_t n);
30 char *mu_strcasestr (const char *haystack, const char *needle); 30 char *mu_c_strcasestr (const char *haystack, const char *needle);
31 31
32 size_t mu_rtrim_class (char *str, int __class); 32 size_t mu_rtrim_class (char *str, int __class);
33 size_t mu_rtrim_cset (char *str, const char *cset); 33 size_t mu_rtrim_cset (char *str, const char *cset);
......
...@@ -23,12 +23,10 @@ ...@@ -23,12 +23,10 @@
23 #include <unistd.h> 23 #include <unistd.h>
24 #include <mailutils/cctype.h> 24 #include <mailutils/cctype.h>
25 25
26
27 /* Based on strstr from GNU libc (Stephen R. van den Berg, 26 /* Based on strstr from GNU libc (Stephen R. van den Berg,
28 berg@pool.informatik.rwth-aachen.de) */ 27 berg@pool.informatik.rwth-aachen.de) */
29 /* FIXME: Rename to mu_c_strcasestr */
30 char * 28 char *
31 mu_strcasestr (const char *a_haystack, const char *a_needle) 29 mu_c_strcasestr (const char *a_haystack, const char *a_needle)
32 { 30 {
33 register const unsigned char *haystack = (unsigned char*) a_haystack, 31 register const unsigned char *haystack = (unsigned char*) a_haystack,
34 *needle = (unsigned char*) a_needle; 32 *needle = (unsigned char*) a_needle;
......
...@@ -420,7 +420,7 @@ i_ascii_casemap_is (const char *pattern, const char *text) ...@@ -420,7 +420,7 @@ i_ascii_casemap_is (const char *pattern, const char *text)
420 static int 420 static int
421 i_ascii_casemap_contains (const char *pattern, const char *text) 421 i_ascii_casemap_contains (const char *pattern, const char *text)
422 { 422 {
423 return mu_strcasestr (text, pattern) != NULL; 423 return mu_c_strcasestr (text, pattern) != NULL;
424 } 424 }
425 425
426 static int 426 static int
......