Merge in ruby bindings.

[notmuch] / bindings / ruby / filenames.c

diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c
index 44a16522feb7567b6ab1b8baa515396cb9f6ebcb..faaa9a0ae15655b51ab26840bd1d32a6a54ebb45 100644 (file)
--- a/bindings/ruby/filenames.c
+++ b/bindings/ruby/filenames.c
@@ -20,6 +20,24 @@
 
 #include "defs.h"
 
+/*
+ * call-seq: FILENAMES.destroy => nil
+ *
+ * Destroys the filenames, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_filenames_destroy(VALUE self)
+{
+    notmuch_filenames_t *fnames;
+
+    Data_Get_Notmuch_FileNames(self, fnames);
+
+    notmuch_filenames_destroy(fnames);
+    DATA_PTR(self) = NULL;
+
+    return Qnil;
+}
+
 /*
  * call-seq: FILENAMES.each {|item| block } => FILENAMES
  *
@@ -29,15 +47,12 @@
 VALUE
 notmuch_rb_filenames_each(VALUE self)
 {
-    notmuch_rb_filenames_t *flist;
+    notmuch_filenames_t *fnames;
 
-    Data_Get_Struct(self, notmuch_rb_filenames_t, flist);
-    if (!flist->nm_flist)
-        return self;
+    Data_Get_Notmuch_FileNames(self, fnames);
 
-    for (; notmuch_filenames_valid(flist->nm_flist);
-            notmuch_filenames_move_to_next(flist->nm_flist))
-        rb_yield(rb_str_new2(notmuch_filenames_get(flist->nm_flist)));
+    for (; notmuch_filenames_valid(fnames); notmuch_filenames_move_to_next(fnames))
+        rb_yield(rb_str_new2(notmuch_filenames_get(fnames)));
 
     return self;
 }