X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=bindings%2Fruby%2Ffilenames.c;h=1787339359c41519be65332e632cf78669b1e10b;hb=777b02a7d7b922bcae08af1c16e475051ec7d8f3;hp=23553ab14e15f6f322b2f653737a61479a13cc0f;hpb=c7893408bbe6904ae7da97aa203587af4ec2fac7;p=notmuch

diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c
index 23553ab1..17873393 100644
--- a/bindings/ruby/filenames.c
+++ b/bindings/ruby/filenames.c
@@ -13,26 +13,28 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
 
 #include "defs.h"
 
+VALUE
+notmuch_rb_filenames_get (notmuch_filenames_t *fnames)
+{
+    return Data_Wrap_Notmuch_Object (notmuch_rb_cFileNames, &notmuch_rb_filenames_type, fnames);
+}
+
 /*
- * call-seq: FILENAMES.destroy => nil
+ * call-seq: FILENAMES.destroy! => nil
  *
  * Destroys the filenames, freeing all resources allocated for it.
  */
 VALUE
-notmuch_rb_filenames_destroy(VALUE self)
+notmuch_rb_filenames_destroy (VALUE self)
 {
-    notmuch_filenames_t *fnames;
-
-    Data_Get_Struct(self, notmuch_filenames_t, fnames);
-
-    notmuch_filenames_destroy(fnames);
+    notmuch_rb_object_destroy (self, &notmuch_rb_filenames_type);
 
     return Qnil;
 }
@@ -44,16 +46,14 @@ notmuch_rb_filenames_destroy(VALUE self)
  * parameter.
  */
 VALUE
-notmuch_rb_filenames_each(VALUE self)
+notmuch_rb_filenames_each (VALUE self)
 {
     notmuch_filenames_t *fnames;
 
-    Data_Get_Struct(self, notmuch_filenames_t, fnames);
-    if (!fnames)
-        return self;
+    Data_Get_Notmuch_FileNames (self, fnames);
 
-    for (; notmuch_filenames_valid(fnames); notmuch_filenames_move_to_next(fnames))
-        rb_yield(rb_str_new2(notmuch_filenames_get(fnames)));
+    for (; notmuch_filenames_valid (fnames); notmuch_filenames_move_to_next (fnames))
+	rb_yield (rb_str_new2 (notmuch_filenames_get (fnames)));
 
     return self;
 }