X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fdirectory.c;h=0f37b3910042426219ae7cdf7137ec1b017cfb11;hp=36dcb8bec22629d795862ce269772ea37b234842;hb=HEAD;hpb=5c9e385591b66fa20cbb186393c48c52831a23b7

diff --git a/bindings/ruby/directory.c b/bindings/ruby/directory.c
index 36dcb8be..f267d82f 100644
--- a/bindings/ruby/directory.c
+++ b/bindings/ruby/directory.c
@@ -1,6 +1,6 @@
 /* The Ruby interface to the notmuch mail library
  *
- * Copyright © 2010 Ali Polatel
+ * Copyright © 2010, 2011 Ali Polatel
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * 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>
  */
@@ -21,19 +21,14 @@
 #include "defs.h"
 
 /*
- * call-seq: DIR.destroy => nil
+ * call-seq: DIR.destroy! => nil
  *
  * Destroys the directory, freeing all resources allocated for it.
  */
 VALUE
-notmuch_rb_directory_destroy(VALUE self)
+notmuch_rb_directory_destroy (VALUE self)
 {
-    notmuch_directory_t *dir;
-
-    Data_Get_Struct(self, notmuch_directory_t, dir);
-
-    notmuch_directory_destroy(dir);
-    DATA_PTR(self) = NULL;
+    notmuch_rb_object_destroy (self, &notmuch_rb_directory_type);
 
     return Qnil;
 }
@@ -45,13 +40,13 @@ notmuch_rb_directory_destroy(VALUE self)
  * stored.
  */
 VALUE
-notmuch_rb_directory_get_mtime(VALUE self)
+notmuch_rb_directory_get_mtime (VALUE self)
 {
     notmuch_directory_t *dir;
 
-    Data_Get_Notmuch_Directory(self, dir);
+    Data_Get_Notmuch_Directory (self, dir);
 
-    return UINT2NUM(notmuch_directory_get_mtime(dir));
+    return UINT2NUM (notmuch_directory_get_mtime (dir));
 }
 
 /*
@@ -60,18 +55,18 @@ notmuch_rb_directory_get_mtime(VALUE self)
  * Store an mtime within the database for the directory object.
  */
 VALUE
-notmuch_rb_directory_set_mtime(VALUE self, VALUE mtimev)
+notmuch_rb_directory_set_mtime (VALUE self, VALUE mtimev)
 {
     notmuch_status_t ret;
     notmuch_directory_t *dir;
 
-    Data_Get_Notmuch_Directory(self, dir);
+    Data_Get_Notmuch_Directory (self, dir);
 
-    if (!FIXNUM_P(mtimev))
-        rb_raise(rb_eTypeError, "First argument not a fixnum");
+    if (!FIXNUM_P (mtimev))
+	rb_raise (rb_eTypeError, "First argument not a fixnum");
 
-    ret = notmuch_directory_set_mtime(dir, FIX2UINT(mtimev));
-    notmuch_rb_status_raise(ret);
+    ret = notmuch_directory_set_mtime (dir, FIX2UINT (mtimev));
+    notmuch_rb_status_raise (ret);
 
     return Qtrue;
 }
@@ -83,16 +78,16 @@ notmuch_rb_directory_set_mtime(VALUE self, VALUE mtimev)
  * filenames of messages in the database within the given directory.
  */
 VALUE
-notmuch_rb_directory_get_child_files(VALUE self)
+notmuch_rb_directory_get_child_files (VALUE self)
 {
     notmuch_directory_t *dir;
     notmuch_filenames_t *fnames;
 
-    Data_Get_Notmuch_Directory(self, dir);
+    Data_Get_Notmuch_Directory (self, dir);
 
-    fnames = notmuch_directory_get_child_files(dir);
+    fnames = notmuch_directory_get_child_files (dir);
 
-    return Data_Wrap_Struct(notmuch_rb_cFileNames, NULL, NULL, fnames);
+    return notmuch_rb_filenames_get (fnames);
 }
 
 /*
@@ -102,14 +97,14 @@ notmuch_rb_directory_get_child_files(VALUE self)
  * directories in the database within the given directory.
  */
 VALUE
-notmuch_rb_directory_get_child_directories(VALUE self)
+notmuch_rb_directory_get_child_directories (VALUE self)
 {
     notmuch_directory_t *dir;
     notmuch_filenames_t *fnames;
 
-    Data_Get_Notmuch_Directory(self, dir);
+    Data_Get_Notmuch_Directory (self, dir);
 
-    fnames = notmuch_directory_get_child_directories(dir);
+    fnames = notmuch_directory_get_child_directories (dir);
 
-    return Data_Wrap_Struct(notmuch_rb_cFileNames, NULL, NULL, fnames);
+    return notmuch_rb_filenames_get (fnames);
 }