ruby: filenames: return string array directly

[notmuch] / bindings / ruby / filenames.c

diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c
index f577173021b3755d8fcc1c03fd7c3082e6bfae65..205414021bfa3aa75ee31c405c41be42479caf9b 100644 (file)
--- a/bindings/ruby/filenames.c
+++ b/bindings/ruby/filenames.c
@@ -13,27 +13,32 @@
  * 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)
+{
+    VALUE rb_array = rb_ary_new ();
+
+    for (; notmuch_filenames_valid (fnames); notmuch_filenames_move_to_next (fnames))
+       rb_ary_push (rb_array, rb_str_new2 (notmuch_filenames_get (fnames)));
+    return rb_array;
+}
+
 /*
  * 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_Notmuch_FileNames(self, fnames);
-
-    notmuch_filenames_destroy(fnames);
-    DATA_PTR(self) = NULL;
+    notmuch_rb_object_destroy (self, &notmuch_rb_filenames_type);
 
     return Qnil;
 }
@@ -45,14 +50,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_Notmuch_FileNames(self, fnames);
+    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;
 }