Revert "build: removing src/utils and replacing with squareball"

This reverts commit 950e6c9148eca244a89d18a21d4ae4e5c3d1c646.

1 files changed, 272 insertions, 272 deletions

diff --git a/tests/check_loader.c b/tests/check_loader.c
index 243b7d5..f5be3e7 100644
--- a/tests/check_loader.c
+++ b/tests/check_loader.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include "../src/template-parser.h"
 #include "../src/loader.h"
-#include <squareball.h>
+#include "../src/utils/utils.h"
 
 
 static void
@@ -80,11 +80,11 @@ test_template_parse_from_file(void **state)
 {
     blogc_error_t *err = NULL;
     will_return(__wrap_blogc_file_get_contents, "bola");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup("{{ BOLA }}\n"));
-    sb_slist_t *l = blogc_template_parse_from_file("bola", &err);
+    will_return(__wrap_blogc_file_get_contents, b_strdup("{{ BOLA }}\n"));
+    b_slist_t *l = blogc_template_parse_from_file("bola", &err);
     assert_null(err);
     assert_non_null(l);
-    assert_int_equal(sb_slist_length(l), 2);
+    assert_int_equal(b_slist_length(l), 2);
     blogc_template_free_stmts(l);
 }
 
@@ -95,7 +95,7 @@ test_template_parse_from_file_null(void **state)
     blogc_error_t *err = NULL;
     will_return(__wrap_blogc_file_get_contents, "bola");
     will_return(__wrap_blogc_file_get_contents, NULL);
-    sb_slist_t *l = blogc_template_parse_from_file("bola", &err);
+    b_slist_t *l = blogc_template_parse_from_file("bola", &err);
     assert_null(err);
     assert_null(l);
 }
@@ -106,20 +106,20 @@ test_source_parse_from_file(void **state)
 {
     blogc_error_t *err = NULL;
     will_return(__wrap_blogc_file_get_contents, "bola.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "--------\n"
         "bola"));
-    sb_trie_t *t = blogc_source_parse_from_file("bola.txt", &err);
+    b_trie_t *t = blogc_source_parse_from_file("bola.txt", &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_trie_size(t), 5);
-    assert_string_equal(sb_trie_lookup(t, "ASD"), "123");
-    assert_string_equal(sb_trie_lookup(t, "FILENAME"), "bola");
-    assert_string_equal(sb_trie_lookup(t, "EXCERPT"), "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(t, "CONTENT"), "<p>bola</p>\n");
-    assert_string_equal(sb_trie_lookup(t, "RAW_CONTENT"), "bola");
-    sb_trie_free(t);
+    assert_int_equal(b_trie_size(t), 5);
+    assert_string_equal(b_trie_lookup(t, "ASD"), "123");
+    assert_string_equal(b_trie_lookup(t, "FILENAME"), "bola");
+    assert_string_equal(b_trie_lookup(t, "EXCERPT"), "<p>bola</p>\n");
+    assert_string_equal(b_trie_lookup(t, "CONTENT"), "<p>bola</p>\n");
+    assert_string_equal(b_trie_lookup(t, "RAW_CONTENT"), "bola");
+    b_trie_free(t);
 }
 
 
@@ -129,7 +129,7 @@ test_source_parse_from_file_null(void **state)
     blogc_error_t *err = NULL;
     will_return(__wrap_blogc_file_get_contents, "bola.txt");
     will_return(__wrap_blogc_file_get_contents, NULL);
-    sb_trie_t *t = blogc_source_parse_from_file("bola.txt", &err);
+    b_trie_t *t = blogc_source_parse_from_file("bola.txt", &err);
     assert_null(err);
     assert_null(t);
 }
@@ -139,41 +139,41 @@ static void
 test_source_parse_from_files(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 3);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 4);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola3");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 3);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 4);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola3");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -181,45 +181,45 @@ static void
 test_source_parse_from_files_filter_by_tag(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "TAGS: chunda\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "TAGS: bola, chunda\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_TAG", sb_strdup("chunda"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_TAG", b_strdup("chunda"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 5);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_TAG"), "chunda");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 5);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola2");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_TAG"), "chunda");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -227,77 +227,77 @@ static void
 test_source_parse_from_files_filter_by_page(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("1"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("1"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 10);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 10);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola2");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "CURRENT_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "NEXT_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "FIRST_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "LAST_PAGE"), "4");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -305,78 +305,78 @@ static void
 test_source_parse_from_files_filter_by_page2(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("3"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("3"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 11);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola5");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola6");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2006-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "3");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "3");
-    assert_string_equal(sb_trie_lookup(c, "PREVIOUS_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "4");
-    assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 11);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola5");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola6");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2006-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PAGE"), "3");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "CURRENT_PAGE"), "3");
+    assert_string_equal(b_trie_lookup(c, "PREVIOUS_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "NEXT_PAGE"), "4");
+    assert_string_equal(b_trie_lookup(c, "FIRST_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "LAST_PAGE"), "4");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -384,77 +384,77 @@ static void
 test_source_parse_from_files_filter_by_page3(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("1"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("1"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 10);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 10);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola2");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "CURRENT_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "NEXT_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "FIRST_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "LAST_PAGE"), "4");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -462,84 +462,84 @@ static void
 test_source_parse_from_files_filter_by_page_and_tag(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "TAGS: chunda\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "TAGS: chunda, bola\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "TAGS: bola\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "TAGS: chunda\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "TAGS: yay, chunda\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_TAG", sb_strdup("chunda"));
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("2"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_TAG", b_strdup("chunda"));
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("2"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 11);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola5");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola7");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2007-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_TAG"), "chunda");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "PREVIOUS_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "2");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 11);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola5");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola7");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2007-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_TAG"), "chunda");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "CURRENT_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "PREVIOUS_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "FIRST_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "LAST_PAGE"), "2");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -547,77 +547,77 @@ static void
 test_source_parse_from_files_filter_by_page_invalid(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("-1"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("-1"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 2);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 10);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2");
-    assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "-1");
-    assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2");
-    assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1");
-    assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 2);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 10);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola2");
+    assert_string_equal(b_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PAGE"), "-1");
+    assert_string_equal(b_trie_lookup(c, "FILTER_PER_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "CURRENT_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "NEXT_PAGE"), "2");
+    assert_string_equal(b_trie_lookup(c, "FIRST_PAGE"), "1");
+    assert_string_equal(b_trie_lookup(c, "LAST_PAGE"), "4");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -625,64 +625,64 @@ static void
 test_source_parse_from_files_filter_by_page_invalid2(void **state)
 {
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "DATE: 2001-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola4.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7891\n"
         "DATE: 2004-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola5.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7892\n"
         "DATE: 2005-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola6.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7893\n"
         "DATE: 2006-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola7.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 7894\n"
         "DATE: 2007-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    s = sb_slist_append(s, sb_strdup("bola4.txt"));
-    s = sb_slist_append(s, sb_strdup("bola5.txt"));
-    s = sb_slist_append(s, sb_strdup("bola6.txt"));
-    s = sb_slist_append(s, sb_strdup("bola7.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_trie_insert(c, "FILTER_PAGE", sb_strdup("5"));
-    sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2"));
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    s = b_slist_append(s, b_strdup("bola4.txt"));
+    s = b_slist_append(s, b_strdup("bola5.txt"));
+    s = b_slist_append(s, b_strdup("bola6.txt"));
+    s = b_slist_append(s, b_strdup("bola7.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_trie_insert(c, "FILTER_PAGE", b_strdup("5"));
+    b_trie_insert(c, "FILTER_PER_PAGE", b_strdup("2"));
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_null(t);
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
+    b_trie_free(c);
+    b_slist_free_full(s, free);
 }
 
 
@@ -695,39 +695,39 @@ test_source_parse_from_files_without_all_dates(void **state)
         "file, but not for all source files. This means that you may get wrong "
         "values for 'DATE_FIRST' and 'DATE_LAST' variables.\n");
     will_return(__wrap_blogc_file_get_contents, "bola1.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 123\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola2.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 456\n"
         "DATE: 2002-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     will_return(__wrap_blogc_file_get_contents, "bola3.txt");
-    will_return(__wrap_blogc_file_get_contents, sb_strdup(
+    will_return(__wrap_blogc_file_get_contents, b_strdup(
         "ASD: 789\n"
         "DATE: 2003-02-03 04:05:06\n"
         "--------\n"
         "bola"));
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    s = sb_slist_append(s, sb_strdup("bola1.txt"));
-    s = sb_slist_append(s, sb_strdup("bola2.txt"));
-    s = sb_slist_append(s, sb_strdup("bola3.txt"));
-    sb_trie_t *c = sb_trie_new(free);
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    s = b_slist_append(s, b_strdup("bola1.txt"));
+    s = b_slist_append(s, b_strdup("bola2.txt"));
+    s = b_slist_append(s, b_strdup("bola3.txt"));
+    b_trie_t *c = b_trie_new(free);
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_non_null(t);
-    assert_int_equal(sb_slist_length(t), 3);  // it is enough, no need to look at the items
-    assert_int_equal(sb_trie_size(c), 3);
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1");
-    assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola3");
-    assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06");
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 3);  // it is enough, no need to look at the items
+    assert_int_equal(b_trie_size(c), 3);
+    assert_string_equal(b_trie_lookup(c, "FILENAME_FIRST"), "bola1");
+    assert_string_equal(b_trie_lookup(c, "FILENAME_LAST"), "bola3");
+    assert_string_equal(b_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06");
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }
 
 
@@ -735,16 +735,16 @@ static void
 test_source_parse_from_files_null(void **state)
 {
     blogc_error_t *err = NULL;
-    sb_slist_t *s = NULL;
-    sb_trie_t *c = sb_trie_new(free);
-    sb_slist_t *t = blogc_source_parse_from_files(c, s, &err);
+    b_slist_t *s = NULL;
+    b_trie_t *c = b_trie_new(free);
+    b_slist_t *t = blogc_source_parse_from_files(c, s, &err);
     assert_null(err);
     assert_null(t);
-    assert_int_equal(sb_slist_length(t), 0);
-    assert_int_equal(sb_trie_size(c), 0);
-    sb_trie_free(c);
-    sb_slist_free_full(s, free);
-    sb_slist_free_full(t, (sb_free_func_t) sb_trie_free);
+    assert_int_equal(b_slist_length(t), 0);
+    assert_int_equal(b_trie_size(c), 0);
+    b_trie_free(c);
+    b_slist_free_full(s, free);
+    b_slist_free_full(t, (b_free_func_t) b_trie_free);
 }