lib: Removed t_strsplit_tab()

It's too easy to use it accidentally instead of using
t_strsplit_tabescaped(). It's also rarely what is actually wanted.

diff --git a/src/lib/strfuncs.c b/src/lib/strfuncs.c
index d5f7c30a7c8abbbae1c739ad23a5071ce942276f..266be153c49183970d8a02054375575241bfd2f2 100644 (file)
--- a/src/lib/strfuncs.c
+++ b/src/lib/strfuncs.c
@@ -591,47 +591,6 @@ char **p_strsplit_spaces(pool_t pool, const char *data,
        return split_str(pool, data, separators, TRUE);
 }
 
-const char **t_strsplit_tab(const char *data)
-{
-        const char **array;
-       char *dest;
-        unsigned int i, array_idx, array_size, dest_size;
-
-       if (*data == '\0')
-               return t_new(const char *, 1);
-
-       array_size = 1;
-       dest_size = 128;
-       dest = t_buffer_get(dest_size+1);
-       for (i = 0; data[i] != '\0'; i++) {
-               if (i >= dest_size) {
-                       dest_size = nearest_power(dest_size+1);
-                       dest = t_buffer_reget(dest, dest_size+1);
-               }
-               if (data[i] != '\t')
-                       dest[i] = data[i];
-               else {
-                       dest[i] = '\0';
-                       array_size++;
-               }
-       }
-       i_assert(i <= dest_size);
-       dest[i] = '\0';
-       t_buffer_alloc(i+1);
-       dest_size = i;
-
-       array = t_new(const char *, array_size + 1);
-       array[0] = dest; array_idx = 1;
-
-       for (i = 0; i < dest_size; i++) {
-               if (dest[i] == '\0')
-                       array[array_idx++] = dest+i+1;
-       }
-       i_assert(array_idx == array_size);
-       array[array_idx] = NULL;
-        return array;
-}
-
 void p_strsplit_free(pool_t pool, char **arr)
 {
        p_free(pool, arr[0]);

diff --git a/src/lib/strfuncs.h b/src/lib/strfuncs.h
index cc87f7bae850bac2232de66498f8e7aeb2449c21..eecbcc67a76f9e4af9e7aa0f37efd5920cee8333 100644 (file)
--- a/src/lib/strfuncs.h
+++ b/src/lib/strfuncs.h
@@ -88,8 +88,6 @@ char **p_strsplit_spaces(pool_t pool, const char *data, const char *separators)
 const char **t_strsplit_spaces(const char *data, const char *separators)
        ATTR_MALLOC ATTR_RETURNS_NONNULL;
 void p_strsplit_free(pool_t pool, char **arr);
-/* Optimized version of t_strsplit(data, "\t") */
-const char **t_strsplit_tab(const char *data) ATTR_MALLOC ATTR_RETURNS_NONNULL;
 
 const char *dec2str(uintmax_t number);
 

diff --git a/src/lib/test-strfuncs.c b/src/lib/test-strfuncs.c
index 26d7ee4c872a7bd3005ffc9ec178e6c0cbf623a9..8f53b246a0594db3823414a0263de895bf733cd4 100644 (file)
--- a/src/lib/test-strfuncs.c
+++ b/src/lib/test-strfuncs.c
@@ -45,56 +45,6 @@ static void test_t_strsplit(void)
        test_end();
 }
 
-static void strsplit_verify(const char *str)
-{
-       T_BEGIN {
-               const char **s1, **s2;
-               unsigned int i;
-
-               s1 = t_strsplit_tab(str);
-               s2 = t_strsplit(str, "\t");
-               for (i = 0; s1[i] != NULL; i++)
-                       test_assert(null_strcmp(s1[i], s2[i]) == 0);
-               test_assert(s2[i] == NULL);
-       } T_END;
-}
-
-static void test_t_strsplit_tab(void)
-{
-       char buf[4096];
-       unsigned int i, j, max;
-
-       test_begin("t_strsplit_tab");
-       strsplit_verify("");
-       strsplit_verify("\t");
-       strsplit_verify("\t\t");
-       strsplit_verify("foo");
-       strsplit_verify("foo\tbar");
-       strsplit_verify("foo\tbar\tbaz");
-       strsplit_verify("foo\t\tbaz");
-       buf[sizeof(buf)-1] = '\0';
-       for (i = 0; i < sizeof(buf)-1; i++)
-               buf[i] = '\t';
-       strsplit_verify(buf);
-       for (j = 0; j < 256; j++) {
-               memset(buf, '\t', j);
-               buf[j+1] = '\0';
-               strsplit_verify(buf);
-       }
-       for (j = 0; j < 100; j++) {
-               max = (rand() % sizeof(buf)) + 1;
-               buf[--max] = '\0';
-               for (i = 0; i < max; i++) {
-                       if (rand() % 10 == 0)
-                               buf[i] = '\t';
-                       else
-                               buf[i] = 'x';
-               }
-               strsplit_verify(buf);
-       }
-       test_end();
-}
-
 static void test_t_str_replace(void)
 {
        test_begin("t_str_replace");
@@ -229,7 +179,6 @@ void test_strfuncs(void)
 {
        test_p_strarray_dup();
        test_t_strsplit();
-       test_t_strsplit_tab();
        test_t_str_replace();
        test_t_str_trim();
        test_t_str_ltrim();