debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ruby: create Data_Wrap_Notmuch_Object helper

Browse source 
This makes the code more maintainable and will help in further patches.

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras 2021-05-15 16:21:00 -05:00 committed by David Bremner
parent 682479592b
commit 12c36a5e3f
8 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bindings/ruby/database.c
View file

@ -23,7 +23,7 @@
VALUE VALUE
notmuch_rb_database_alloc (VALUE klass) notmuch_rb_database_alloc (VALUE klass)
{ {
return Data_Wrap_Struct (klass, NULL, NULL, NULL); return Data_Wrap_Notmuch_Object (klass, NULL);
} }
/* /*
@ -266,7 +266,7 @@ notmuch_rb_database_get_directory (VALUE self, VALUE pathv)
ret = notmuch_database_get_directory (db, path, &dir); ret = notmuch_database_get_directory (db, path, &dir);
notmuch_rb_status_raise (ret); notmuch_rb_status_raise (ret);
if (dir) if (dir)
return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir); return Data_Wrap_Notmuch_Object (notmuch_rb_cDirectory, dir);
return Qnil; return Qnil;
} }
@ -293,7 +293,7 @@ notmuch_rb_database_add_message (VALUE self, VALUE pathv)
ret = notmuch_database_index_file (db, path, NULL, &message); ret = notmuch_database_index_file (db, path, NULL, &message);
notmuch_rb_status_raise (ret); notmuch_rb_status_raise (ret);
return rb_assoc_new (Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message), return rb_assoc_new (Data_Wrap_Notmuch_Object (notmuch_rb_cMessage, message),
(ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse); (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse);
} }
@ -344,7 +344,7 @@ notmuch_rb_database_find_message (VALUE self, VALUE idv)
notmuch_rb_status_raise (ret); notmuch_rb_status_raise (ret);
if (message) if (message)
return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessage, message);
return Qnil; return Qnil;
} }
@ -370,7 +370,7 @@ notmuch_rb_database_find_message_by_filename (VALUE self, VALUE pathv)
notmuch_rb_status_raise (ret); notmuch_rb_status_raise (ret);
if (message) if (message)
return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessage, message);
return Qnil; return Qnil;
} }
@ -395,7 +395,7 @@ notmuch_rb_database_get_all_tags (VALUE self)
rb_raise (notmuch_rb_eBaseError, "%s", msg); rb_raise (notmuch_rb_eBaseError, "%s", msg);
} }
return Data_Wrap_Struct (notmuch_rb_cTags, NULL, NULL, tags); return Data_Wrap_Notmuch_Object (notmuch_rb_cTags, tags);
} }
/* /*
@ -419,5 +419,5 @@ notmuch_rb_database_query_create (VALUE self, VALUE qstrv)
if (!query) if (!query)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cQuery, NULL, NULL, query); return Data_Wrap_Notmuch_Object (notmuch_rb_cQuery, query);
} }

3
bindings/ruby/defs.h
View file

@ -64,6 +64,9 @@ extern ID ID_db_mode;
} \ } \
} while (0) } while (0)
#define Data_Wrap_Notmuch_Object(klass, ptr) \
Data_Wrap_Struct ((klass), NULL, NULL, (ptr))
#define Data_Get_Notmuch_Database(obj, ptr) \ #define Data_Get_Notmuch_Database(obj, ptr) \
Data_Get_Notmuch_Object ((obj), (ptr)) Data_Get_Notmuch_Object ((obj), (ptr))

4
bindings/ruby/directory.c
View file

@ -92,7 +92,7 @@ notmuch_rb_directory_get_child_files (VALUE self)
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 Data_Wrap_Notmuch_Object (notmuch_rb_cFileNames, fnames);
} }
/* /*
@ -111,5 +111,5 @@ notmuch_rb_directory_get_child_directories (VALUE self)
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 Data_Wrap_Notmuch_Object (notmuch_rb_cFileNames, fnames);
} }

6
bindings/ruby/message.c
View file

@ -89,7 +89,7 @@ notmuch_rb_message_get_replies (VALUE self)
messages = notmuch_message_get_replies (message); messages = notmuch_message_get_replies (message);
return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessages, messages);
} }
/* /*
@ -125,7 +125,7 @@ notmuch_rb_message_get_filenames (VALUE self)
fnames = notmuch_message_get_filenames (message); fnames = notmuch_message_get_filenames (message);
return Data_Wrap_Struct (notmuch_rb_cFileNames, NULL, NULL, fnames); return Data_Wrap_Notmuch_Object (notmuch_rb_cFileNames, fnames);
} }
/* /*
@ -226,7 +226,7 @@ notmuch_rb_message_get_tags (VALUE self)
if (!tags) if (!tags)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cTags, NULL, NULL, tags); return Data_Wrap_Notmuch_Object (notmuch_rb_cTags, tags);
} }
/* /*

4
bindings/ruby/messages.c
View file

@ -53,7 +53,7 @@ notmuch_rb_messages_each (VALUE self)
for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages); message = notmuch_messages_get (messages);
rb_yield (Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message)); rb_yield (Data_Wrap_Notmuch_Object (notmuch_rb_cMessage, message));
} }
return self; return self;
@ -76,5 +76,5 @@ notmuch_rb_messages_collect_tags (VALUE self)
if (!tags) if (!tags)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cTags, NULL, NULL, tags); return Data_Wrap_Notmuch_Object (notmuch_rb_cTags, tags);
} }

4
bindings/ruby/query.c
View file

@ -142,7 +142,7 @@ notmuch_rb_query_search_threads (VALUE self)
if (status) if (status)
notmuch_rb_status_raise (status); notmuch_rb_status_raise (status);
return Data_Wrap_Struct (notmuch_rb_cThreads, NULL, NULL, threads); return Data_Wrap_Notmuch_Object (notmuch_rb_cThreads, threads);
} }
/* /*
@ -163,7 +163,7 @@ notmuch_rb_query_search_messages (VALUE self)
if (status) if (status)
notmuch_rb_status_raise (status); notmuch_rb_status_raise (status);
return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessages, messages);
} }
/* /*

6
bindings/ruby/thread.c
View file

@ -88,7 +88,7 @@ notmuch_rb_thread_get_toplevel_messages (VALUE self)
if (!messages) if (!messages)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessages, messages);
} }
/* /*
@ -108,7 +108,7 @@ notmuch_rb_thread_get_messages (VALUE self)
if (!messages) if (!messages)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages); return Data_Wrap_Notmuch_Object (notmuch_rb_cMessages, messages);
} }
/* /*
@ -209,5 +209,5 @@ notmuch_rb_thread_get_tags (VALUE self)
if (!tags) if (!tags)
rb_raise (notmuch_rb_eMemoryError, "Out of memory"); rb_raise (notmuch_rb_eMemoryError, "Out of memory");
return Data_Wrap_Struct (notmuch_rb_cTags, NULL, NULL, tags); return Data_Wrap_Notmuch_Object (notmuch_rb_cTags, tags);
} }

2
bindings/ruby/threads.c
View file

@ -53,7 +53,7 @@ notmuch_rb_threads_each (VALUE self)
for (; notmuch_threads_valid (threads); notmuch_threads_move_to_next (threads)) { for (; notmuch_threads_valid (threads); notmuch_threads_move_to_next (threads)) {
thread = notmuch_threads_get (threads); thread = notmuch_threads_get (threads);
rb_yield (Data_Wrap_Struct (notmuch_rb_cThread, NULL, NULL, thread)); rb_yield (Data_Wrap_Notmuch_Object (notmuch_rb_cThread, thread));
} }
return self; return self;