ruby: remove FileNames object

[notmuch] / bindings / ruby / defs.h

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index a33ef0da69d392467e64d747dae447f2adddf212..f2a7e484401362f1aad9a47c61bbdcd96a801cdc 100644 (file)
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -33,7 +33,6 @@ extern VALUE notmuch_rb_cThreads;
 extern VALUE notmuch_rb_cThread;
 extern VALUE notmuch_rb_cMessages;
 extern VALUE notmuch_rb_cMessage;
-extern VALUE notmuch_rb_cTags;
 
 extern VALUE notmuch_rb_eBaseError;
 extern VALUE notmuch_rb_eDatabaseError;
@@ -59,7 +58,6 @@ extern ID ID_db_mode;
 extern const rb_data_type_t notmuch_rb_object_type;
 extern const rb_data_type_t notmuch_rb_database_type;
 extern const rb_data_type_t notmuch_rb_directory_type;
-extern const rb_data_type_t notmuch_rb_filenames_type;
 extern const rb_data_type_t notmuch_rb_query_type;
 extern const rb_data_type_t notmuch_rb_threads_type;
 extern const rb_data_type_t notmuch_rb_thread_type;
@@ -92,9 +90,6 @@ extern const rb_data_type_t notmuch_rb_tags_type;
 #define Data_Get_Notmuch_Directory(obj, ptr) \
     Data_Get_Notmuch_Object ((obj), &notmuch_rb_directory_type, (ptr))
 
-#define Data_Get_Notmuch_FileNames(obj, ptr) \
-    Data_Get_Notmuch_Object ((obj), &notmuch_rb_filenames_type, (ptr))
-
 #define Data_Get_Notmuch_Query(obj, ptr) \
     Data_Get_Notmuch_Object ((obj), &notmuch_rb_query_type, (ptr))
 
@@ -136,20 +131,17 @@ notmuch_rb_object_free (void *rb_wrapper)
     talloc_free (rb_wrapper);
 }
 
-static inline notmuch_status_t
+static inline void
 notmuch_rb_object_destroy (VALUE rb_object, const rb_data_type_t *type)
 {
     notmuch_rb_object_t *rb_wrapper;
-    notmuch_status_t ret;
 
     Data_Get_Notmuch_Rb_Object (rb_object, type, rb_wrapper);
 
     /* Call the corresponding notmuch_*_destroy function */
-    ret = ((notmuch_status_t (*)(void *)) type->data) (rb_wrapper->nm_object);
+    ((void (*)(void *)) type->data) (rb_wrapper->nm_object);
     notmuch_rb_object_free (rb_wrapper);
     DATA_PTR (rb_object) = NULL;
-
-    return ret;
 }
 
 /* status.c */
@@ -229,10 +221,7 @@ notmuch_rb_directory_get_child_directories (VALUE self);
 
 /* filenames.c */
 VALUE
-notmuch_rb_filenames_destroy (VALUE self);
-
-VALUE
-notmuch_rb_filenames_each (VALUE self);
+notmuch_rb_filenames_get (notmuch_filenames_t *fnames);
 
 /* query.c */
 VALUE
@@ -373,10 +362,7 @@ notmuch_rb_message_thaw (VALUE self);
 
 /* tags.c */
 VALUE
-notmuch_rb_tags_destroy (VALUE self);
-
-VALUE
-notmuch_rb_tags_each (VALUE self);
+notmuch_rb_tags_get (notmuch_tags_t *tags);
 
 /* init.c */
 void