Implement an internal generic string list and use it.

[notmuch] / lib / directory.cc

diff --git a/lib/directory.cc b/lib/directory.cc
index 946be4f45ef0704ea50041a45c4a20a0d6e48c95..aeee9caf067580aaef1c5d309eb18b185e3078a3 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -33,11 +33,11 @@ _create_filenames_for_terms_with_prefix (void *ctx,
                                         notmuch_database_t *notmuch,
                                         const char *prefix)
 {
                                         notmuch_database_t *notmuch,
                                         const char *prefix)
 {

-    notmuch_filename_list_t *filename_list;
+    notmuch_string_list_t *filename_list;

     Xapian::TermIterator i, end;
     int prefix_len = strlen (prefix);
 
     Xapian::TermIterator i, end;
     int prefix_len = strlen (prefix);
 

-    filename_list = _notmuch_filename_list_create (ctx);
+    filename_list = _notmuch_string_list_create (ctx);

     if (unlikely (filename_list == NULL))
        return NULL;
 
     if (unlikely (filename_list == NULL))
        return NULL;
 


@@ -47,8 +47,7 @@ _create_filenames_for_terms_with_prefix (void *ctx,
     {
        std::string term = *i;
 
     {
        std::string term = *i;
 

-       _notmuch_filename_list_add_filename (filename_list, term.c_str () +
-                                            prefix_len);
+       _notmuch_string_list_append (filename_list, term.c_str () + prefix_len);

     }
 
     return _notmuch_filenames_create (ctx, filename_list);
     }
 
     return _notmuch_filenames_create (ctx, filename_list);