Mercurial > dovecot > core-2.2
changeset 19459:6cb9889cc960
lib: Removed t_str_trim() for now due to collision in Pigeonhole v0.4.9
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 04 Dec 2015 12:29:12 +0200 |
| parents | 0b81127e53da |
| children | 1b32cd3b872c |
| files | src/lib/strfuncs.c src/lib/strfuncs.h src/lib/test-strfuncs.c |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/strfuncs.c Fri Dec 04 12:15:49 2015 +0200 +++ b/src/lib/strfuncs.c Fri Dec 04 12:29:12 2015 +0200 @@ -364,6 +364,7 @@ return str_ucase(t_strdup_noconst(str)); } +#if 0 /* FIXME: wait for v2.3 due to a collision with pigeonhole */ const char *t_str_trim(const char *str, const char *chars) { const char *p, *pend, *begin; @@ -385,6 +386,7 @@ return ""; return t_strdup_until(begin, p+1); } +#endif const char *str_ltrim(const char *str, const char *chars) {
--- a/src/lib/strfuncs.h Fri Dec 04 12:15:49 2015 +0200 +++ b/src/lib/strfuncs.h Fri Dec 04 12:29:12 2015 +0200 @@ -57,7 +57,7 @@ const char *str_ltrim(const char *str, const char *chars); const char *t_str_ltrim(const char *str, const char *chars); const char *t_str_rtrim(const char *str, const char *chars); -const char *t_str_trim(const char *str, const char *chars); +/*const char *t_str_trim(const char *str, const char *chars);*/ int null_strcmp(const char *s1, const char *s2) ATTR_PURE; int bsearch_strcmp(const char *key, const char *const *member) ATTR_PURE;
--- a/src/lib/test-strfuncs.c Fri Dec 04 12:15:49 2015 +0200 +++ b/src/lib/test-strfuncs.c Fri Dec 04 12:29:12 2015 +0200 @@ -109,6 +109,7 @@ test_end(); } +#if 0 static void test_t_str_trim(void) { test_begin("t_str_trim"); @@ -124,6 +125,7 @@ test_assert(strcmp(t_str_trim("\tfoo\tfoo\t", "\t \r"), "foo\tfoo") == 0); test_end(); } +#endif static void test_t_str_ltrim(void) { @@ -163,7 +165,7 @@ test_t_strsplit(); test_t_strsplit_tab(); test_t_str_replace(); - test_t_str_trim(); + /*test_t_str_trim();*/ test_t_str_ltrim(); test_t_str_rtrim(); }