From 05dddf883dd762420bb8e6b86790e68d734fd568 Mon Sep 17 00:00:00 2001 From: Ali Polatel Date: Tue, 4 Oct 2011 16:41:52 +0300 Subject: [PATCH 1/1] ruby: be consistent with notmuch's coding style No functional change, just indentation --- bindings/ruby/database.c | 247 +++++++++++++++++----------------- bindings/ruby/defs.h | 272 +++++++++++++++++++------------------- bindings/ruby/directory.c | 44 +++--- bindings/ruby/extconf.rb | 3 +- bindings/ruby/filenames.c | 16 +-- bindings/ruby/init.c | 222 +++++++++++++++---------------- bindings/ruby/message.c | 178 ++++++++++++------------- bindings/ruby/messages.c | 30 ++--- bindings/ruby/query.c | 52 ++++---- bindings/ruby/status.c | 26 ++-- bindings/ruby/tags.c | 20 +-- bindings/ruby/thread.c | 78 +++++------ bindings/ruby/threads.c | 20 +-- 13 files changed, 603 insertions(+), 605 deletions(-) diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c index 90c220a1..b75dfd18 100644 --- a/bindings/ruby/database.c +++ b/bindings/ruby/database.c @@ -21,9 +21,9 @@ #include "defs.h" VALUE -notmuch_rb_database_alloc(VALUE klass) +notmuch_rb_database_alloc (VALUE klass) { - return Data_Wrap_Struct(klass, NULL, NULL, NULL); + return Data_Wrap_Struct (klass, NULL, NULL, NULL); } /* @@ -36,7 +36,7 @@ notmuch_rb_database_alloc(VALUE klass) * The argument :mode specifies the open mode of the database. */ VALUE -notmuch_rb_database_initialize(int argc, VALUE *argv, VALUE self) +notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self) { const char *path; int create, mode; @@ -44,43 +44,42 @@ notmuch_rb_database_initialize(int argc, VALUE *argv, VALUE self) VALUE modev; #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) +# define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ /* Check arguments */ - rb_scan_args(argc, argv, "11", &pathv, &hashv); - - SafeStringValue(pathv); - path = RSTRING_PTR(pathv); - - if (!NIL_P(hashv)) { - Check_Type(hashv, T_HASH); - create = RTEST(rb_hash_aref(hashv, ID2SYM(ID_db_create))); - modev = rb_hash_aref(hashv, ID2SYM(ID_db_mode)); - if (NIL_P(modev)) - mode = NOTMUCH_DATABASE_MODE_READ_ONLY; - else if (!FIXNUM_P(modev)) - rb_raise(rb_eTypeError, ":mode isn't a Fixnum"); - else { - mode = FIX2INT(modev); - switch (mode) { - case NOTMUCH_DATABASE_MODE_READ_ONLY: - case NOTMUCH_DATABASE_MODE_READ_WRITE: - break; - default: - rb_raise(rb_eTypeError, "Invalid mode"); - } - } - } - else { - create = 0; - mode = NOTMUCH_DATABASE_MODE_READ_ONLY; + rb_scan_args (argc, argv, "11", &pathv, &hashv); + + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); + + if (!NIL_P (hashv)) { + Check_Type (hashv, T_HASH); + create = RTEST (rb_hash_aref (hashv, ID2SYM (ID_db_create))); + modev = rb_hash_aref (hashv, ID2SYM (ID_db_mode)); + if (NIL_P (modev)) + mode = NOTMUCH_DATABASE_MODE_READ_ONLY; + else if (!FIXNUM_P (modev)) + rb_raise (rb_eTypeError, ":mode isn't a Fixnum"); + else { + mode = FIX2INT (modev); + switch (mode) { + case NOTMUCH_DATABASE_MODE_READ_ONLY: + case NOTMUCH_DATABASE_MODE_READ_WRITE: + break; + default: + rb_raise ( rb_eTypeError, "Invalid mode"); + } + } + } else { + create = 0; + mode = NOTMUCH_DATABASE_MODE_READ_ONLY; } - Check_Type(self, T_DATA); - DATA_PTR(self) = create ? notmuch_database_create(path) : notmuch_database_open(path, mode); - if (!DATA_PTR(self)) - rb_raise(notmuch_rb_eDatabaseError, "Failed to open database"); + Check_Type (self, T_DATA); + DATA_PTR (self) = create ? notmuch_database_create (path) : notmuch_database_open (path, mode); + if (!DATA_PTR (self)) + rb_raise (notmuch_rb_eDatabaseError, "Failed to open database"); return self; } @@ -93,15 +92,15 @@ notmuch_rb_database_initialize(int argc, VALUE *argv, VALUE self) * the block. */ VALUE -notmuch_rb_database_open(int argc, VALUE *argv, VALUE klass) +notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass) { VALUE obj; - obj = rb_class_new_instance(argc, argv, klass); - if (!rb_block_given_p()) - return obj; + obj = rb_class_new_instance (argc, argv, klass); + if (!rb_block_given_p ()) + return obj; - return rb_ensure(rb_yield, obj, notmuch_rb_database_close, obj); + return rb_ensure (rb_yield, obj, notmuch_rb_database_close, obj); } /* @@ -110,13 +109,13 @@ notmuch_rb_database_open(int argc, VALUE *argv, VALUE klass) * Close the notmuch database. */ VALUE -notmuch_rb_database_close(VALUE self) +notmuch_rb_database_close (VALUE self) { notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); - notmuch_database_close(db); - DATA_PTR(self) = NULL; + Data_Get_Notmuch_Database (self, db); + notmuch_database_close (db); + DATA_PTR (self) = NULL; return Qnil; } @@ -127,13 +126,13 @@ notmuch_rb_database_close(VALUE self) * Return the path of the database */ VALUE -notmuch_rb_database_path(VALUE self) +notmuch_rb_database_path (VALUE self) { notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - return rb_str_new2(notmuch_database_get_path(db)); + return rb_str_new2 (notmuch_database_get_path (db)); } /* @@ -142,13 +141,13 @@ notmuch_rb_database_path(VALUE self) * Return the version of the database */ VALUE -notmuch_rb_database_version(VALUE self) +notmuch_rb_database_version (VALUE self) { notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - return INT2FIX(notmuch_database_get_version(db)); + return INT2FIX (notmuch_database_get_version (db)); } /* @@ -157,20 +156,20 @@ notmuch_rb_database_version(VALUE self) * Return the +true+ if the database needs upgrading, +false+ otherwise */ VALUE -notmuch_rb_database_needs_upgrade(VALUE self) +notmuch_rb_database_needs_upgrade (VALUE self) { notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - return notmuch_database_needs_upgrade(db) ? Qtrue : Qfalse; + return notmuch_database_needs_upgrade (db) ? Qtrue : Qfalse; } static void -notmuch_rb_upgrade_notify(void *closure, double progress) +notmuch_rb_upgrade_notify (void *closure, double progress) { - VALUE *block = (VALUE *)closure; - rb_funcall(*block, ID_call, 1, rb_float_new(progress)); + VALUE *block = (VALUE *) closure; + rb_funcall (*block, ID_call, 1, rb_float_new (progress)); } /* @@ -182,24 +181,24 @@ notmuch_rb_upgrade_notify(void *closure, double progress) * floating point value in the range of [0.0..1.0]. */ VALUE -notmuch_rb_database_upgrade(VALUE self) +notmuch_rb_database_upgrade (VALUE self) { notmuch_status_t ret; void (*pnotify) (void *closure, double progress); notmuch_database_t *db; VALUE block; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - if (rb_block_given_p()) { - pnotify = notmuch_rb_upgrade_notify; - block = rb_block_proc(); + if (rb_block_given_p ()) { + pnotify = notmuch_rb_upgrade_notify; + block = rb_block_proc (); } else - pnotify = NULL; + pnotify = NULL; - ret = notmuch_database_upgrade(db, pnotify, pnotify ? &block : NULL); - notmuch_rb_status_raise(ret); + ret = notmuch_database_upgrade (db, pnotify, pnotify ? &block : NULL); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -210,15 +209,15 @@ notmuch_rb_database_upgrade(VALUE self) * Begin an atomic database operation. */ VALUE -notmuch_rb_database_begin_atomic(VALUE self) +notmuch_rb_database_begin_atomic (VALUE self) { notmuch_status_t ret; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - ret = notmuch_database_begin_atomic(db); - notmuch_rb_status_raise(ret); + ret = notmuch_database_begin_atomic (db); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -229,15 +228,15 @@ notmuch_rb_database_begin_atomic(VALUE self) * Indicate the end of an atomic database operation. */ VALUE -notmuch_rb_database_end_atomic(VALUE self) +notmuch_rb_database_end_atomic (VALUE self) { notmuch_status_t ret; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); - ret = notmuch_database_end_atomic(db); - notmuch_rb_status_raise(ret); + ret = notmuch_database_end_atomic (db); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -248,26 +247,26 @@ notmuch_rb_database_end_atomic(VALUE self) * Retrieve a directory object from the database for 'path' */ VALUE -notmuch_rb_database_get_directory(VALUE self, VALUE pathv) +notmuch_rb_database_get_directory (VALUE self, VALUE pathv) { const char *path; notmuch_directory_t *dir; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) +# define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ - SafeStringValue(pathv); - path = RSTRING_PTR(pathv); + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); - dir = notmuch_database_get_directory(db, path); + dir = notmuch_database_get_directory (db, path); if (!dir) - rb_raise(notmuch_rb_eXapianError, "Xapian exception"); + rb_raise (notmuch_rb_eXapianError, "Xapian exception"); - return Data_Wrap_Struct(notmuch_rb_cDirectory, NULL, NULL, dir); + return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir); } /* @@ -279,30 +278,30 @@ notmuch_rb_database_get_directory(VALUE self, VALUE pathv) * duplicate. */ VALUE -notmuch_rb_database_add_message(VALUE self, VALUE pathv) +notmuch_rb_database_add_message (VALUE self, VALUE pathv) { const char *path; notmuch_status_t ret; notmuch_message_t *message; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) +# define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ - SafeStringValue(pathv); - path = RSTRING_PTR(pathv); + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); - ret = notmuch_database_add_message(db, path, &message); - notmuch_rb_status_raise(ret); - return rb_assoc_new(Data_Wrap_Struct(notmuch_rb_cMessage, NULL, NULL, message), + ret = notmuch_database_add_message (db, path, &message); + notmuch_rb_status_raise (ret); + return rb_assoc_new (Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message), (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse); } /* - * call-seq: DB.remove_message(path) => isdup + * call-seq: DB.remove_message (path) => isdup * * Remove a message from the database. * @@ -310,23 +309,23 @@ notmuch_rb_database_add_message(VALUE self, VALUE pathv) * duplicate. */ VALUE -notmuch_rb_database_remove_message(VALUE self, VALUE pathv) +notmuch_rb_database_remove_message (VALUE self, VALUE pathv) { const char *path; notmuch_status_t ret; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ +# define RSTRING_PTR(v) (RSTRING((v))->ptr) +#endif /* !defined (RSTRING_PTR) */ - SafeStringValue(pathv); - path = RSTRING_PTR(pathv); + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); - ret = notmuch_database_remove_message(db, path); - notmuch_rb_status_raise(ret); + ret = notmuch_database_remove_message (db, path); + notmuch_rb_status_raise (ret); return (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse; } @@ -336,27 +335,27 @@ notmuch_rb_database_remove_message(VALUE self, VALUE pathv) * Find a message by message id. */ VALUE -notmuch_rb_database_find_message(VALUE self, VALUE idv) +notmuch_rb_database_find_message (VALUE self, VALUE idv) { const char *id; notmuch_status_t ret; notmuch_database_t *db; notmuch_message_t *message; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ +# define RSTRING_PTR(v) (RSTRING((v))->ptr) +#endif /* !defined (RSTRING_PTR) */ - SafeStringValue(idv); - id = RSTRING_PTR(idv); + SafeStringValue (idv); + id = RSTRING_PTR (idv); - ret = notmuch_database_find_message(db, id, &message); - notmuch_rb_status_raise(ret); + ret = notmuch_database_find_message (db, id, &message); + notmuch_rb_status_raise (ret); if (message) - return Data_Wrap_Struct(notmuch_rb_cMessage, NULL, NULL, message); + return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message); return Qnil; } @@ -366,27 +365,27 @@ notmuch_rb_database_find_message(VALUE self, VALUE idv) * Find a message by filename. */ VALUE -notmuch_rb_database_find_message_by_filename(VALUE self, VALUE pathv) +notmuch_rb_database_find_message_by_filename (VALUE self, VALUE pathv) { const char *path; notmuch_status_t ret; notmuch_database_t *db; notmuch_message_t *message; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ +# define RSTRING_PTR(v) (RSTRING((v))->ptr) +#endif /* !defined (RSTRING_PTR) */ - SafeStringValue(pathv); - path = RSTRING_PTR(pathv); + SafeStringValue (pathv); + path = RSTRING_PTR (pathv); - ret = notmuch_database_find_message_by_filename(db, path, &message); - notmuch_rb_status_raise(ret); + ret = notmuch_database_find_message_by_filename (db, path, &message); + notmuch_rb_status_raise (ret); if (message) - return Data_Wrap_Struct(notmuch_rb_cMessage, NULL, NULL, message); + return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message); return Qnil; } @@ -396,24 +395,24 @@ notmuch_rb_database_find_message_by_filename(VALUE self, VALUE pathv) * Retrieve a query object for the query string 'query' */ VALUE -notmuch_rb_database_query_create(VALUE self, VALUE qstrv) +notmuch_rb_database_query_create (VALUE self, VALUE qstrv) { const char *qstr; notmuch_query_t *query; notmuch_database_t *db; - Data_Get_Notmuch_Database(self, db); + Data_Get_Notmuch_Database (self, db); #if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ +# define RSTRING_PTR(v) (RSTRING((v))->ptr) +#endif /* !defined (RSTRING_PTR) */ - SafeStringValue(qstrv); - qstr = RSTRING_PTR(qstrv); + SafeStringValue (qstrv); + qstr = RSTRING_PTR (qstrv); - query = notmuch_query_create(db, qstr); + query = notmuch_query_create (db, qstr); 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_Struct (notmuch_rb_cQuery, NULL, NULL, query); } diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 5446868e..44f6e321 100644 --- a/bindings/ruby/defs.h +++ b/bindings/ruby/defs.h @@ -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 @@ -50,279 +50,279 @@ ID ID_call; ID ID_db_create; ID ID_db_mode; -#define Data_Get_Notmuch_Database(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "database closed"); \ - Data_Get_Struct(obj, notmuch_database_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Directory(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "directory destroyed"); \ - Data_Get_Struct(obj, notmuch_directory_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_FileNames(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "filenames destroyed"); \ - Data_Get_Struct(obj, notmuch_filenames_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Query(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "query destroyed"); \ - Data_Get_Struct(obj, notmuch_query_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Threads(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "threads destroyed"); \ - Data_Get_Struct(obj, notmuch_threads_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Messages(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "messages destroyed"); \ - Data_Get_Struct(obj, notmuch_messages_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Thread(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "thread destroyed"); \ - Data_Get_Struct(obj, notmuch_thread_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Message(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "message destroyed"); \ - Data_Get_Struct(obj, notmuch_message_t, ptr); \ - } while(0) - -#define Data_Get_Notmuch_Tags(obj, ptr) \ - do { \ - Check_Type(obj, T_DATA); \ - if (DATA_PTR(obj) == NULL) \ - rb_raise(rb_eRuntimeError, "tags destroyed"); \ - Data_Get_Struct(obj, notmuch_tags_t, ptr); \ - } while(0) +#define Data_Get_Notmuch_Database (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "database closed"); \ + Data_Get_Struct (obj, notmuch_database_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Directory (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "directory destroyed"); \ + Data_Get_Struct (obj, notmuch_directory_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_FileNames (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "filenames destroyed"); \ + Data_Get_Struct (obj, notmuch_filenames_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Query (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "query destroyed"); \ + Data_Get_Struct (obj, notmuch_query_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Threads (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "threads destroyed"); \ + Data_Get_Struct (obj, notmuch_threads_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Messages (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "messages destroyed"); \ + Data_Get_Struct (obj, notmuch_messages_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Thread (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "thread destroyed"); \ + Data_Get_Struct (obj, notmuch_thread_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Message (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "message destroyed"); \ + Data_Get_Struct (obj, notmuch_message_t, ptr); \ + } while (0) + +#define Data_Get_Notmuch_Tags (obj, ptr) \ + do { \ + Check_Type (obj, T_DATA); \ + if (DATA_PTR (obj) == NULL) \ + rb_raise (rb_eRuntimeError, "tags destroyed"); \ + Data_Get_Struct (obj, notmuch_tags_t, ptr); \ + } while (0) /* status.c */ void -notmuch_rb_status_raise(notmuch_status_t status); +notmuch_rb_status_raise (notmuch_status_t status); /* database.c */ VALUE -notmuch_rb_database_alloc(VALUE klass); +notmuch_rb_database_alloc (VALUE klass); VALUE -notmuch_rb_database_initialize(int argc, VALUE *argv, VALUE klass); +notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE klass); VALUE -notmuch_rb_database_open(int argc, VALUE *argv, VALUE klass); +notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass); VALUE -notmuch_rb_database_close(VALUE self); +notmuch_rb_database_close (VALUE self); VALUE -notmuch_rb_database_path(VALUE self); +notmuch_rb_database_path (VALUE self); VALUE -notmuch_rb_database_version(VALUE self); +notmuch_rb_database_version (VALUE self); VALUE -notmuch_rb_database_needs_upgrade(VALUE self); +notmuch_rb_database_needs_upgrade (VALUE self); VALUE -notmuch_rb_database_upgrade(VALUE self); +notmuch_rb_database_upgrade (VALUE self); VALUE -notmuch_rb_database_begin_atomic(VALUE self); +notmuch_rb_database_begin_atomic (VALUE self); VALUE -notmuch_rb_database_end_atomic(VALUE self); +notmuch_rb_database_end_atomic (VALUE self); VALUE -notmuch_rb_database_get_directory(VALUE self, VALUE pathv); +notmuch_rb_database_get_directory (VALUE self, VALUE pathv); VALUE -notmuch_rb_database_add_message(VALUE self, VALUE pathv); +notmuch_rb_database_add_message (VALUE self, VALUE pathv); VALUE -notmuch_rb_database_remove_message(VALUE self, VALUE pathv); +notmuch_rb_database_remove_message (VALUE self, VALUE pathv); VALUE -notmuch_rb_database_query_create(VALUE self, VALUE qstrv); +notmuch_rb_database_query_create (VALUE self, VALUE qstrv); /* directory.c */ VALUE -notmuch_rb_directory_destroy(VALUE self); +notmuch_rb_directory_destroy (VALUE self); VALUE -notmuch_rb_directory_get_mtime(VALUE self); +notmuch_rb_directory_get_mtime (VALUE self); VALUE -notmuch_rb_directory_set_mtime(VALUE self, VALUE mtimev); +notmuch_rb_directory_set_mtime (VALUE self, VALUE mtimev); VALUE -notmuch_rb_directory_get_child_files(VALUE self); +notmuch_rb_directory_get_child_files (VALUE self); VALUE -notmuch_rb_directory_get_child_directories(VALUE self); +notmuch_rb_directory_get_child_directories (VALUE self); /* filenames.c */ VALUE -notmuch_rb_filenames_destroy(VALUE self); +notmuch_rb_filenames_destroy (VALUE self); VALUE -notmuch_rb_filenames_each(VALUE self); +notmuch_rb_filenames_each (VALUE self); /* query.c */ VALUE -notmuch_rb_query_destroy(VALUE self); +notmuch_rb_query_destroy (VALUE self); VALUE -notmuch_rb_query_get_sort(VALUE self); +notmuch_rb_query_get_sort (VALUE self); VALUE -notmuch_rb_query_set_sort(VALUE self, VALUE sortv); +notmuch_rb_query_set_sort (VALUE self, VALUE sortv); VALUE -notmuch_rb_query_get_string(VALUE self); +notmuch_rb_query_get_string (VALUE self); VALUE -notmuch_rb_query_search_threads(VALUE self); +notmuch_rb_query_search_threads (VALUE self); VALUE -notmuch_rb_query_search_messages(VALUE self); +notmuch_rb_query_search_messages (VALUE self); /* threads.c */ VALUE -notmuch_rb_threads_destroy(VALUE self); +notmuch_rb_threads_destroy (VALUE self); VALUE -notmuch_rb_threads_each(VALUE self); +notmuch_rb_threads_each (VALUE self); /* messages.c */ VALUE -notmuch_rb_messages_destroy(VALUE self); +notmuch_rb_messages_destroy (VALUE self); VALUE -notmuch_rb_messages_each(VALUE self); +notmuch_rb_messages_each (VALUE self); VALUE -notmuch_rb_messages_collect_tags(VALUE self); +notmuch_rb_messages_collect_tags (VALUE self); /* thread.c */ VALUE -notmuch_rb_thread_destroy(VALUE self); +notmuch_rb_thread_destroy (VALUE self); VALUE -notmuch_rb_thread_get_thread_id(VALUE self); +notmuch_rb_thread_get_thread_id (VALUE self); VALUE -notmuch_rb_thread_get_total_messages(VALUE self); +notmuch_rb_thread_get_total_messages (VALUE self); VALUE -notmuch_rb_thread_get_toplevel_messages(VALUE self); +notmuch_rb_thread_get_toplevel_messages (VALUE self); VALUE -notmuch_rb_thread_get_matched_messages(VALUE self); +notmuch_rb_thread_get_matched_messages (VALUE self); VALUE -notmuch_rb_thread_get_authors(VALUE self); +notmuch_rb_thread_get_authors (VALUE self); VALUE -notmuch_rb_thread_get_subject(VALUE self); +notmuch_rb_thread_get_subject (VALUE self); VALUE -notmuch_rb_thread_get_oldest_date(VALUE self); +notmuch_rb_thread_get_oldest_date (VALUE self); VALUE -notmuch_rb_thread_get_newest_date(VALUE self); +notmuch_rb_thread_get_newest_date (VALUE self); VALUE -notmuch_rb_thread_get_tags(VALUE self); +notmuch_rb_thread_get_tags (VALUE self); /* message.c */ VALUE -notmuch_rb_message_destroy(VALUE self); +notmuch_rb_message_destroy (VALUE self); VALUE -notmuch_rb_message_get_message_id(VALUE self); +notmuch_rb_message_get_message_id (VALUE self); VALUE -notmuch_rb_message_get_thread_id(VALUE self); +notmuch_rb_message_get_thread_id (VALUE self); VALUE -notmuch_rb_message_get_replies(VALUE self); +notmuch_rb_message_get_replies (VALUE self); VALUE -notmuch_rb_message_get_filename(VALUE self); +notmuch_rb_message_get_filename (VALUE self); VALUE -notmuch_rb_message_get_filenames(VALUE self); +notmuch_rb_message_get_filenames (VALUE self); VALUE -notmuch_rb_message_get_flag(VALUE self, VALUE flagv); +notmuch_rb_message_get_flag (VALUE self, VALUE flagv); VALUE -notmuch_rb_message_set_flag(VALUE self, VALUE flagv, VALUE valuev); +notmuch_rb_message_set_flag (VALUE self, VALUE flagv, VALUE valuev); VALUE -notmuch_rb_message_get_date(VALUE self); +notmuch_rb_message_get_date (VALUE self); VALUE -notmuch_rb_message_get_header(VALUE self, VALUE headerv); +notmuch_rb_message_get_header (VALUE self, VALUE headerv); VALUE -notmuch_rb_message_get_tags(VALUE self); +notmuch_rb_message_get_tags (VALUE self); VALUE -notmuch_rb_message_add_tag(VALUE self, VALUE tagv); +notmuch_rb_message_add_tag (VALUE self, VALUE tagv); VALUE -notmuch_rb_message_remove_tag(VALUE self, VALUE tagv); +notmuch_rb_message_remove_tag (VALUE self, VALUE tagv); VALUE -notmuch_rb_message_remove_all_tags(VALUE self); +notmuch_rb_message_remove_all_tags (VALUE self); VALUE -notmuch_rb_message_maildir_flags_to_tags(VALUE self); +notmuch_rb_message_maildir_flags_to_tags (VALUE self); VALUE -notmuch_rb_message_tags_to_maildir_flags(VALUE self); +notmuch_rb_message_tags_to_maildir_flags (VALUE self); VALUE -notmuch_rb_message_freeze(VALUE self); +notmuch_rb_message_freeze (VALUE self); VALUE -notmuch_rb_message_thaw(VALUE self); +notmuch_rb_message_thaw (VALUE self); /* tags.c */ VALUE -notmuch_rb_tags_destroy(VALUE self); +notmuch_rb_tags_destroy (VALUE self); VALUE -notmuch_rb_tags_each(VALUE self); +notmuch_rb_tags_each (VALUE self); /* init.c */ void -Init_notmuch(void); +Init_notmuch (void); #endif diff --git a/bindings/ruby/directory.c b/bindings/ruby/directory.c index 5602c092..303523c2 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 @@ -26,14 +26,14 @@ * 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); + Data_Get_Struct (self, notmuch_directory_t, dir); - notmuch_directory_destroy(dir); - DATA_PTR(self) = NULL; + notmuch_directory_destroy (dir); + DATA_PTR (self) = NULL; return Qnil; } @@ -45,13 +45,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 +60,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 +83,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 Data_Wrap_Struct (notmuch_rb_cFileNames, NULL, NULL, fnames); } /* @@ -102,14 +102,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 Data_Wrap_Struct (notmuch_rb_cFileNames, NULL, NULL, fnames); } diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index a9d9d42b..ccac609c 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -1,7 +1,6 @@ #!/usr/bin/env ruby # coding: utf-8 -# vim: set sw=2 sts=2 et nowrap fenc=utf-8 : -# Copyright 2010 Ali Polatel +# Copyright 2010, 2011 Ali Polatel # Distributed under the terms of the GNU General Public License v3 require 'mkmf' diff --git a/bindings/ruby/filenames.c b/bindings/ruby/filenames.c index f5771730..e2785903 100644 --- a/bindings/ruby/filenames.c +++ b/bindings/ruby/filenames.c @@ -26,14 +26,14 @@ * 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); + Data_Get_Notmuch_FileNames (self, fnames); - notmuch_filenames_destroy(fnames); - DATA_PTR(self) = NULL; + notmuch_filenames_destroy (fnames); + DATA_PTR (self) = NULL; return Qnil; } @@ -45,14 +45,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; } diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c index 72e1a478..1ea40c26 100644 --- a/bindings/ruby/init.c +++ b/bindings/ruby/init.c @@ -43,273 +43,273 @@ */ void -Init_notmuch(void) +Init_notmuch (void) { VALUE mod; - ID_call = rb_intern("call"); - ID_db_create = rb_intern("create"); - ID_db_mode = rb_intern("mode"); + ID_call = rb_intern ("call"); + ID_db_create = rb_intern ("create"); + ID_db_mode = rb_intern ("mode"); - mod = rb_define_module("Notmuch"); + mod = rb_define_module ("Notmuch"); /* * Document-const: Notmuch::MODE_READ_ONLY * * Open the database in read only mode */ - rb_define_const(mod, "MODE_READ_ONLY", INT2FIX(NOTMUCH_DATABASE_MODE_READ_ONLY)); + rb_define_const (mod, "MODE_READ_ONLY", INT2FIX (NOTMUCH_DATABASE_MODE_READ_ONLY)); /* * Document-const: Notmuch::MODE_READ_WRITE * * Open the database in read write mode */ - rb_define_const(mod, "MODE_READ_WRITE", INT2FIX(NOTMUCH_DATABASE_MODE_READ_WRITE)); + rb_define_const (mod, "MODE_READ_WRITE", INT2FIX (NOTMUCH_DATABASE_MODE_READ_WRITE)); /* * Document-const: Notmuch::SORT_OLDEST_FIRST * * Sort query results by oldest first */ - rb_define_const(mod, "SORT_OLDEST_FIRST", INT2FIX(NOTMUCH_SORT_OLDEST_FIRST)); + rb_define_const (mod, "SORT_OLDEST_FIRST", INT2FIX (NOTMUCH_SORT_OLDEST_FIRST)); /* * Document-const: Notmuch::SORT_NEWEST_FIRST * * Sort query results by newest first */ - rb_define_const(mod, "SORT_NEWEST_FIRST", INT2FIX(NOTMUCH_SORT_NEWEST_FIRST)); + rb_define_const (mod, "SORT_NEWEST_FIRST", INT2FIX (NOTMUCH_SORT_NEWEST_FIRST)); /* * Document-const: Notmuch::SORT_MESSAGE_ID * * Sort query results by message id */ - rb_define_const(mod, "SORT_MESSAGE_ID", INT2FIX(NOTMUCH_SORT_MESSAGE_ID)); + rb_define_const (mod, "SORT_MESSAGE_ID", INT2FIX (NOTMUCH_SORT_MESSAGE_ID)); /* * Document-const: Notmuch::SORT_UNSORTED * * Do not sort query results */ - rb_define_const(mod, "SORT_UNSORTED", INT2FIX(NOTMUCH_SORT_UNSORTED)); + rb_define_const (mod, "SORT_UNSORTED", INT2FIX (NOTMUCH_SORT_UNSORTED)); /* * Document-const: Notmuch::MESSAGE_FLAG_MATCH * * Message flag "match" */ - rb_define_const(mod, "MESSAGE_FLAG_MATCH", INT2FIX(NOTMUCH_MESSAGE_FLAG_MATCH)); + rb_define_const (mod, "MESSAGE_FLAG_MATCH", INT2FIX (NOTMUCH_MESSAGE_FLAG_MATCH)); /* * Document-const: Notmuch::TAG_MAX * * Maximum allowed length of a tag */ - rb_define_const(mod, "TAG_MAX", INT2FIX(NOTMUCH_TAG_MAX)); + rb_define_const (mod, "TAG_MAX", INT2FIX (NOTMUCH_TAG_MAX)); /* * Document-class: Notmuch::BaseError * * Base class for all notmuch exceptions */ - notmuch_rb_eBaseError = rb_define_class_under(mod, "BaseError", rb_eStandardError); + notmuch_rb_eBaseError = rb_define_class_under (mod, "BaseError", rb_eStandardError); /* * Document-class: Notmuch::DatabaseError * * Raised when the database can't be created or opened. */ - notmuch_rb_eDatabaseError = rb_define_class_under(mod, "DatabaseError", notmuch_rb_eBaseError); + notmuch_rb_eDatabaseError = rb_define_class_under (mod, "DatabaseError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::MemoryError * * Raised when notmuch is out of memory */ - notmuch_rb_eMemoryError = rb_define_class_under(mod, "MemoryError", notmuch_rb_eBaseError); + notmuch_rb_eMemoryError = rb_define_class_under (mod, "MemoryError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::ReadOnlyError * * Raised when an attempt was made to write to a database opened in read-only * mode. */ - notmuch_rb_eReadOnlyError = rb_define_class_under(mod, "ReadOnlyError", notmuch_rb_eBaseError); + notmuch_rb_eReadOnlyError = rb_define_class_under (mod, "ReadOnlyError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::XapianError * * Raised when a Xapian exception occurs */ - notmuch_rb_eXapianError = rb_define_class_under(mod, "XapianError", notmuch_rb_eBaseError); + notmuch_rb_eXapianError = rb_define_class_under (mod, "XapianError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::FileError * * Raised when an error occurs trying to read or write to a file. */ - notmuch_rb_eFileError = rb_define_class_under(mod, "FileError", notmuch_rb_eBaseError); + notmuch_rb_eFileError = rb_define_class_under (mod, "FileError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::FileNotEmailError * * Raised when a file is presented that doesn't appear to be an email message. */ - notmuch_rb_eFileNotEmailError = rb_define_class_under(mod, "FileNotEmailError", notmuch_rb_eBaseError); + notmuch_rb_eFileNotEmailError = rb_define_class_under (mod, "FileNotEmailError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::NullPointerError * * Raised when the user erroneously passes a +NULL+ pointer to a notmuch * function. */ - notmuch_rb_eNullPointerError = rb_define_class_under(mod, "NullPointerError", notmuch_rb_eBaseError); + notmuch_rb_eNullPointerError = rb_define_class_under (mod, "NullPointerError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::TagTooLongError * * Raised when a tag value is too long (exceeds Notmuch::TAG_MAX) */ - notmuch_rb_eTagTooLongError = rb_define_class_under(mod, "TagTooLongError", notmuch_rb_eBaseError); + notmuch_rb_eTagTooLongError = rb_define_class_under (mod, "TagTooLongError", notmuch_rb_eBaseError); /* * Document-class: Notmuch::UnbalancedFreezeThawError * * Raised when the notmuch_message_thaw function has been called more times * than notmuch_message_freeze. */ - notmuch_rb_eUnbalancedFreezeThawError = rb_define_class_under(mod, "UnbalancedFreezeThawError", - notmuch_rb_eBaseError); + notmuch_rb_eUnbalancedFreezeThawError = rb_define_class_under (mod, "UnbalancedFreezeThawError", + notmuch_rb_eBaseError); /* * Document-class: Notmuch::UnbalancedAtomicError * * Raised when notmuch_database_end_atomic has been called more times than * notmuch_database_begin_atomic */ - notmuch_rb_eUnbalancedAtomicError = rb_define_class_under(mod, "UnbalancedAtomicError", - notmuch_rb_eBaseError); + notmuch_rb_eUnbalancedAtomicError = rb_define_class_under (mod, "UnbalancedAtomicError", + notmuch_rb_eBaseError); /* * Document-class: Notmuch::Database * * Notmuch database interaction */ - notmuch_rb_cDatabase = rb_define_class_under(mod, "Database", rb_cData); - rb_define_alloc_func(notmuch_rb_cDatabase, notmuch_rb_database_alloc); - rb_define_singleton_method(notmuch_rb_cDatabase, "open", notmuch_rb_database_open, -1); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "initialize", notmuch_rb_database_initialize, -1); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "close", notmuch_rb_database_close, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "path", notmuch_rb_database_path, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "needs_upgrade?", notmuch_rb_database_needs_upgrade, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "upgrade!", notmuch_rb_database_upgrade, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "begin_atomic", notmuch_rb_database_begin_atomic, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "end_atomic", notmuch_rb_database_end_atomic, 0); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "get_directory", notmuch_rb_database_get_directory, 1); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "add_message", notmuch_rb_database_add_message, 1); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "remove_message", notmuch_rb_database_remove_message, 1); /* in database.c */ - rb_define_method(notmuch_rb_cDatabase, "query", notmuch_rb_database_query_create, 1); /* in database.c */ + notmuch_rb_cDatabase = rb_define_class_under (mod, "Database", rb_cData); + rb_define_alloc_func (notmuch_rb_cDatabase, notmuch_rb_database_alloc); + rb_define_singleton_method (notmuch_rb_cDatabase, "open", notmuch_rb_database_open, -1); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "initialize", notmuch_rb_database_initialize, -1); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "close", notmuch_rb_database_close, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "path", notmuch_rb_database_path, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "needs_upgrade?", notmuch_rb_database_needs_upgrade, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "upgrade!", notmuch_rb_database_upgrade, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "begin_atomic", notmuch_rb_database_begin_atomic, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "end_atomic", notmuch_rb_database_end_atomic, 0); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "get_directory", notmuch_rb_database_get_directory, 1); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "add_message", notmuch_rb_database_add_message, 1); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "remove_message", notmuch_rb_database_remove_message, 1); /* in database.c */ + rb_define_method (notmuch_rb_cDatabase, "query", notmuch_rb_database_query_create, 1); /* in database.c */ /* * Document-class: Notmuch::Directory * * Notmuch directory */ - notmuch_rb_cDirectory = rb_define_class_under(mod, "Directory", rb_cData); - rb_undef_method(notmuch_rb_cDirectory, "initialize"); - rb_define_method(notmuch_rb_cDirectory, "destroy!", notmuch_rb_directory_destroy, 0); /* in directory.c */ - rb_define_method(notmuch_rb_cDirectory, "mtime", notmuch_rb_directory_get_mtime, 0); /* in directory.c */ - rb_define_method(notmuch_rb_cDirectory, "mtime=", notmuch_rb_directory_set_mtime, 1); /* in directory.c */ - rb_define_method(notmuch_rb_cDirectory, "child_files", notmuch_rb_directory_get_child_files, 0); /* in directory.c */ - rb_define_method(notmuch_rb_cDirectory, "child_directories", notmuch_rb_directory_get_child_directories, 0); /* in directory.c */ + notmuch_rb_cDirectory = rb_define_class_under (mod, "Directory", rb_cData); + rb_undef_method (notmuch_rb_cDirectory, "initialize"); + rb_define_method (notmuch_rb_cDirectory, "destroy!", notmuch_rb_directory_destroy, 0); /* in directory.c */ + rb_define_method (notmuch_rb_cDirectory, "mtime", notmuch_rb_directory_get_mtime, 0); /* in directory.c */ + rb_define_method (notmuch_rb_cDirectory, "mtime=", notmuch_rb_directory_set_mtime, 1); /* in directory.c */ + rb_define_method (notmuch_rb_cDirectory, "child_files", notmuch_rb_directory_get_child_files, 0); /* in directory.c */ + rb_define_method (notmuch_rb_cDirectory, "child_directories", notmuch_rb_directory_get_child_directories, 0); /* in directory.c */ /* * Document-class: Notmuch::FileNames * * Notmuch file names */ - notmuch_rb_cFileNames = rb_define_class_under(mod, "FileNames", rb_cData); - rb_undef_method(notmuch_rb_cFileNames, "initialize"); - rb_define_method(notmuch_rb_cFileNames, "destroy!", notmuch_rb_filenames_destroy, 0); /* in filenames.c */ - rb_define_method(notmuch_rb_cFileNames, "each", notmuch_rb_filenames_each, 0); /* in filenames.c */ - rb_include_module(notmuch_rb_cFileNames, rb_mEnumerable); + notmuch_rb_cFileNames = rb_define_class_under (mod, "FileNames", rb_cData); + rb_undef_method (notmuch_rb_cFileNames, "initialize"); + rb_define_method (notmuch_rb_cFileNames, "destroy!", notmuch_rb_filenames_destroy, 0); /* in filenames.c */ + rb_define_method (notmuch_rb_cFileNames, "each", notmuch_rb_filenames_each, 0); /* in filenames.c */ + rb_include_module (notmuch_rb_cFileNames, rb_mEnumerable); /* * Document-class: Notmuch::Query * * Notmuch query */ - notmuch_rb_cQuery = rb_define_class_under(mod, "Query", rb_cData); - rb_undef_method(notmuch_rb_cQuery, "initialize"); - rb_define_method(notmuch_rb_cQuery, "destroy!", notmuch_rb_query_destroy, 0); /* in query.c */ - rb_define_method(notmuch_rb_cQuery, "sort", notmuch_rb_query_get_sort, 0); /* in query.c */ - rb_define_method(notmuch_rb_cQuery, "sort=", notmuch_rb_query_set_sort, 1); /* in query.c */ - rb_define_method(notmuch_rb_cQuery, "to_s", notmuch_rb_query_get_string, 0); /* in query.c */ - rb_define_method(notmuch_rb_cQuery, "search_threads", notmuch_rb_query_search_threads, 0); /* in query.c */ - rb_define_method(notmuch_rb_cQuery, "search_messages", notmuch_rb_query_search_messages, 0); /* in query.c */ + notmuch_rb_cQuery = rb_define_class_under (mod, "Query", rb_cData); + rb_undef_method (notmuch_rb_cQuery, "initialize"); + rb_define_method (notmuch_rb_cQuery, "destroy!", notmuch_rb_query_destroy, 0); /* in query.c */ + rb_define_method (notmuch_rb_cQuery, "sort", notmuch_rb_query_get_sort, 0); /* in query.c */ + rb_define_method (notmuch_rb_cQuery, "sort=", notmuch_rb_query_set_sort, 1); /* in query.c */ + rb_define_method (notmuch_rb_cQuery, "to_s", notmuch_rb_query_get_string, 0); /* in query.c */ + rb_define_method (notmuch_rb_cQuery, "search_threads", notmuch_rb_query_search_threads, 0); /* in query.c */ + rb_define_method (notmuch_rb_cQuery, "search_messages", notmuch_rb_query_search_messages, 0); /* in query.c */ /* * Document-class: Notmuch::Threads * * Notmuch threads */ - notmuch_rb_cThreads = rb_define_class_under(mod, "Threads", rb_cData); - rb_undef_method(notmuch_rb_cThreads, "initialize"); - rb_define_method(notmuch_rb_cThreads, "destroy!", notmuch_rb_threads_destroy, 0); /* in threads.c */ - rb_define_method(notmuch_rb_cThreads, "each", notmuch_rb_threads_each, 0); /* in threads.c */ - rb_include_module(notmuch_rb_cThreads, rb_mEnumerable); + notmuch_rb_cThreads = rb_define_class_under (mod, "Threads", rb_cData); + rb_undef_method (notmuch_rb_cThreads, "initialize"); + rb_define_method (notmuch_rb_cThreads, "destroy!", notmuch_rb_threads_destroy, 0); /* in threads.c */ + rb_define_method (notmuch_rb_cThreads, "each", notmuch_rb_threads_each, 0); /* in threads.c */ + rb_include_module (notmuch_rb_cThreads, rb_mEnumerable); /* * Document-class: Notmuch::Messages * * Notmuch messages */ - notmuch_rb_cMessages = rb_define_class_under(mod, "Messages", rb_cData); - rb_undef_method(notmuch_rb_cMessages, "initialize"); - rb_define_method(notmuch_rb_cMessages, "destroy!", notmuch_rb_messages_destroy, 0); /* in messages.c */ - rb_define_method(notmuch_rb_cMessages, "each", notmuch_rb_messages_each, 0); /* in messages.c */ - rb_define_method(notmuch_rb_cMessages, "tags", notmuch_rb_messages_collect_tags, 0); /* in messages.c */ - rb_include_module(notmuch_rb_cMessages, rb_mEnumerable); + notmuch_rb_cMessages = rb_define_class_under (mod, "Messages", rb_cData); + rb_undef_method (notmuch_rb_cMessages, "initialize"); + rb_define_method (notmuch_rb_cMessages, "destroy!", notmuch_rb_messages_destroy, 0); /* in messages.c */ + rb_define_method (notmuch_rb_cMessages, "each", notmuch_rb_messages_each, 0); /* in messages.c */ + rb_define_method (notmuch_rb_cMessages, "tags", notmuch_rb_messages_collect_tags, 0); /* in messages.c */ + rb_include_module (notmuch_rb_cMessages, rb_mEnumerable); /* * Document-class: Notmuch::Thread * * Notmuch thread */ - notmuch_rb_cThread = rb_define_class_under(mod, "Thread", rb_cData); - rb_undef_method(notmuch_rb_cThread, "initialize"); - rb_define_method(notmuch_rb_cThread, "destroy!", notmuch_rb_thread_destroy, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "thread_id", notmuch_rb_thread_get_thread_id, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "total_messages", notmuch_rb_thread_get_total_messages, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "toplevel_messages", notmuch_rb_thread_get_toplevel_messages, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "matched_messages", notmuch_rb_thread_get_matched_messages, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "authors", notmuch_rb_thread_get_authors, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "subject", notmuch_rb_thread_get_subject, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "oldest_date", notmuch_rb_thread_get_oldest_date, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "newest_date", notmuch_rb_thread_get_newest_date, 0); /* in thread.c */ - rb_define_method(notmuch_rb_cThread, "tags", notmuch_rb_thread_get_tags, 0); /* in thread.c */ + notmuch_rb_cThread = rb_define_class_under (mod, "Thread", rb_cData); + rb_undef_method (notmuch_rb_cThread, "initialize"); + rb_define_method (notmuch_rb_cThread, "destroy!", notmuch_rb_thread_destroy, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "thread_id", notmuch_rb_thread_get_thread_id, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "total_messages", notmuch_rb_thread_get_total_messages, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "toplevel_messages", notmuch_rb_thread_get_toplevel_messages, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "matched_messages", notmuch_rb_thread_get_matched_messages, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "authors", notmuch_rb_thread_get_authors, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "subject", notmuch_rb_thread_get_subject, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "oldest_date", notmuch_rb_thread_get_oldest_date, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "newest_date", notmuch_rb_thread_get_newest_date, 0); /* in thread.c */ + rb_define_method (notmuch_rb_cThread, "tags", notmuch_rb_thread_get_tags, 0); /* in thread.c */ /* * Document-class: Notmuch::Message * * Notmuch message */ - notmuch_rb_cMessage = rb_define_class_under(mod, "Message", rb_cData); - rb_undef_method(notmuch_rb_cMessage, "initialize"); - rb_define_method(notmuch_rb_cMessage, "destroy!", notmuch_rb_message_destroy, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "message_id", notmuch_rb_message_get_message_id, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "thread_id", notmuch_rb_message_get_thread_id, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "replies", notmuch_rb_message_get_replies, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "filename", notmuch_rb_message_get_filename, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "filenames", notmuch_rb_message_get_filenames, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "get_flag", notmuch_rb_message_get_flag, 1); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "set_flag", notmuch_rb_message_set_flag, 2); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "date", notmuch_rb_message_get_date, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "header", notmuch_rb_message_get_header, 1); /* in message.c */ - rb_define_alias(notmuch_rb_cMessage, "[]", "header"); - rb_define_method(notmuch_rb_cMessage, "tags", notmuch_rb_message_get_tags, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "add_tag", notmuch_rb_message_add_tag, 1); /* in message.c */ - rb_define_alias(notmuch_rb_cMessage, "<<", "add_tag"); - rb_define_method(notmuch_rb_cMessage, "remove_tag", notmuch_rb_message_remove_tag, 1); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "remove_all_tags", notmuch_rb_message_remove_all_tags, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "maildir_flags_to_tags", notmuch_rb_message_maildir_flags_to_tags, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "tags_to_maildir_flags", notmuch_rb_message_tags_to_maildir_flags, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "freeze", notmuch_rb_message_freeze, 0); /* in message.c */ - rb_define_method(notmuch_rb_cMessage, "thaw", notmuch_rb_message_thaw, 0); /* in message.c */ + notmuch_rb_cMessage = rb_define_class_under (mod, "Message", rb_cData); + rb_undef_method (notmuch_rb_cMessage, "initialize"); + rb_define_method (notmuch_rb_cMessage, "destroy!", notmuch_rb_message_destroy, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "message_id", notmuch_rb_message_get_message_id, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "thread_id", notmuch_rb_message_get_thread_id, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "replies", notmuch_rb_message_get_replies, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "filename", notmuch_rb_message_get_filename, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "filenames", notmuch_rb_message_get_filenames, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "get_flag", notmuch_rb_message_get_flag, 1); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "set_flag", notmuch_rb_message_set_flag, 2); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "date", notmuch_rb_message_get_date, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "header", notmuch_rb_message_get_header, 1); /* in message.c */ + rb_define_alias (notmuch_rb_cMessage, "[]", "header"); + rb_define_method (notmuch_rb_cMessage, "tags", notmuch_rb_message_get_tags, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "add_tag", notmuch_rb_message_add_tag, 1); /* in message.c */ + rb_define_alias (notmuch_rb_cMessage, "<<", "add_tag"); + rb_define_method (notmuch_rb_cMessage, "remove_tag", notmuch_rb_message_remove_tag, 1); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "remove_all_tags", notmuch_rb_message_remove_all_tags, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "maildir_flags_to_tags", notmuch_rb_message_maildir_flags_to_tags, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "tags_to_maildir_flags", notmuch_rb_message_tags_to_maildir_flags, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "freeze", notmuch_rb_message_freeze, 0); /* in message.c */ + rb_define_method (notmuch_rb_cMessage, "thaw", notmuch_rb_message_thaw, 0); /* in message.c */ /* * Document-class: Notmuch::Tags * * Notmuch tags */ - notmuch_rb_cTags = rb_define_class_under(mod, "Tags", rb_cData); - rb_undef_method(notmuch_rb_cTags, "initialize"); - rb_define_method(notmuch_rb_cTags, "destroy!", notmuch_rb_tags_destroy, 0); /* in tags.c */ - rb_define_method(notmuch_rb_cTags, "each", notmuch_rb_tags_each, 0); /* in tags.c */ - rb_include_module(notmuch_rb_cTags, rb_mEnumerable); + notmuch_rb_cTags = rb_define_class_under (mod, "Tags", rb_cData); + rb_undef_method (notmuch_rb_cTags, "initialize"); + rb_define_method (notmuch_rb_cTags, "destroy!", notmuch_rb_tags_destroy, 0); /* in tags.c */ + rb_define_method (notmuch_rb_cTags, "each", notmuch_rb_tags_each, 0); /* in tags.c */ + rb_include_module (notmuch_rb_cTags, rb_mEnumerable); } diff --git a/bindings/ruby/message.c b/bindings/ruby/message.c index f84ed925..cadc841f 100644 --- a/bindings/ruby/message.c +++ b/bindings/ruby/message.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 @@ -26,14 +26,14 @@ * Destroys the message, freeing all resources allocated for it. */ VALUE -notmuch_rb_message_destroy(VALUE self) +notmuch_rb_message_destroy (VALUE self) { notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - notmuch_message_destroy(message); - DATA_PTR(self) = NULL; + notmuch_message_destroy (message); + DATA_PTR (self) = NULL; return Qnil; } @@ -44,16 +44,16 @@ notmuch_rb_message_destroy(VALUE self) * Get the message ID of 'message'. */ VALUE -notmuch_rb_message_get_message_id(VALUE self) +notmuch_rb_message_get_message_id (VALUE self) { const char *msgid; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - msgid = notmuch_message_get_message_id(message); + msgid = notmuch_message_get_message_id (message); - return rb_str_new2(msgid); + return rb_str_new2 (msgid); } /* @@ -62,16 +62,16 @@ notmuch_rb_message_get_message_id(VALUE self) * Get the thread ID of 'message'. */ VALUE -notmuch_rb_message_get_thread_id(VALUE self) +notmuch_rb_message_get_thread_id (VALUE self) { const char *tid; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - tid = notmuch_message_get_thread_id(message); + tid = notmuch_message_get_thread_id (message); - return rb_str_new2(tid); + return rb_str_new2 (tid); } /* @@ -80,16 +80,16 @@ notmuch_rb_message_get_thread_id(VALUE self) * Get a Notmuch::Messages enumerable for all of the replies to 'message'. */ VALUE -notmuch_rb_message_get_replies(VALUE self) +notmuch_rb_message_get_replies (VALUE self) { notmuch_messages_t *messages; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - 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_Struct (notmuch_rb_cMessages, NULL, NULL, messages); } /* @@ -98,16 +98,16 @@ notmuch_rb_message_get_replies(VALUE self) * Get a filename for the email corresponding to 'message' */ VALUE -notmuch_rb_message_get_filename(VALUE self) +notmuch_rb_message_get_filename (VALUE self) { const char *fname; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - fname = notmuch_message_get_filename(message); + fname = notmuch_message_get_filename (message); - return rb_str_new2(fname); + return rb_str_new2 (fname); } /* @@ -116,52 +116,52 @@ notmuch_rb_message_get_filename(VALUE self) * Get all filenames for the email corresponding to MESSAGE. */ VALUE -notmuch_rb_message_get_filenames(VALUE self) +notmuch_rb_message_get_filenames (VALUE self) { notmuch_filenames_t *fnames; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - 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_Struct (notmuch_rb_cFileNames, NULL, NULL, fnames); } /* - * call-seq: MESSAGE.get_flag(flag) => true or false + * call-seq: MESSAGE.get_flag (flag) => true or false * * Get a value of a flag for the email corresponding to 'message' */ VALUE -notmuch_rb_message_get_flag(VALUE self, VALUE flagv) +notmuch_rb_message_get_flag (VALUE self, VALUE flagv) { notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - if (!FIXNUM_P(flagv)) - rb_raise(rb_eTypeError, "Flag not a Fixnum"); + if (!FIXNUM_P (flagv)) + rb_raise (rb_eTypeError, "Flag not a Fixnum"); - return notmuch_message_get_flag(message, FIX2INT(flagv)) ? Qtrue : Qfalse; + return notmuch_message_get_flag (message, FIX2INT (flagv)) ? Qtrue : Qfalse; } /* - * call-seq: MESSAGE.set_flag(flag, value) => nil + * call-seq: MESSAGE.set_flag (flag, value) => nil * * Set a value of a flag for the email corresponding to 'message' */ VALUE -notmuch_rb_message_set_flag(VALUE self, VALUE flagv, VALUE valuev) +notmuch_rb_message_set_flag (VALUE self, VALUE flagv, VALUE valuev) { notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - if (!FIXNUM_P(flagv)) - rb_raise(rb_eTypeError, "Flag not a Fixnum"); + if (!FIXNUM_P (flagv)) + rb_raise (rb_eTypeError, "Flag not a Fixnum"); - notmuch_message_set_flag(message, FIX2INT(flagv), RTEST(valuev)); + notmuch_message_set_flag (message, FIX2INT (flagv), RTEST (valuev)); return Qnil; } @@ -172,40 +172,40 @@ notmuch_rb_message_set_flag(VALUE self, VALUE flagv, VALUE valuev) * Get the date of 'message' */ VALUE -notmuch_rb_message_get_date(VALUE self) +notmuch_rb_message_get_date (VALUE self) { notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - return UINT2NUM(notmuch_message_get_date(message)); + return UINT2NUM (notmuch_message_get_date (message)); } /* - * call-seq: MESSAGE.header(name) => String + * call-seq: MESSAGE.header (name) => String * * Get the value of the specified header from 'message' */ VALUE -notmuch_rb_message_get_header(VALUE self, VALUE headerv) +notmuch_rb_message_get_header (VALUE self, VALUE headerv) { const char *header, *value; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); #if !defined(RSTRING_PTR) #define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ - SafeStringValue(headerv); - header = RSTRING_PTR(headerv); + SafeStringValue (headerv); + header = RSTRING_PTR (headerv); - value = notmuch_message_get_header(message, header); + value = notmuch_message_get_header (message, header); if (!value) - rb_raise(notmuch_rb_eMemoryError, "Out of memory"); + rb_raise (notmuch_rb_eMemoryError, "Out of memory"); - return rb_str_new2(value); + return rb_str_new2 (value); } /* @@ -214,70 +214,70 @@ notmuch_rb_message_get_header(VALUE self, VALUE headerv) * Get a Notmuch::Tags enumerable for all of the tags of 'message'. */ VALUE -notmuch_rb_message_get_tags(VALUE self) +notmuch_rb_message_get_tags (VALUE self) { notmuch_message_t *message; notmuch_tags_t *tags; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - tags = notmuch_message_get_tags(message); + tags = notmuch_message_get_tags (message); 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_Struct (notmuch_rb_cTags, NULL, NULL, tags); } /* - * call-seq: MESSAGE.add_tag(tag) => true + * call-seq: MESSAGE.add_tag (tag) => true * * Add a tag to the 'message' */ VALUE -notmuch_rb_message_add_tag(VALUE self, VALUE tagv) +notmuch_rb_message_add_tag (VALUE self, VALUE tagv) { const char *tag; notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); #if !defined(RSTRING_PTR) #define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ - SafeStringValue(tagv); - tag = RSTRING_PTR(tagv); + SafeStringValue (tagv); + tag = RSTRING_PTR (tagv); - ret = notmuch_message_add_tag(message, tag); - notmuch_rb_status_raise(ret); + ret = notmuch_message_add_tag (message, tag); + notmuch_rb_status_raise (ret); return Qtrue; } /* - * call-seq: MESSAGE.remove_tag(tag) => true + * call-seq: MESSAGE.remove_tag (tag) => true * * Remove a tag from the 'message' */ VALUE -notmuch_rb_message_remove_tag(VALUE self, VALUE tagv) +notmuch_rb_message_remove_tag (VALUE self, VALUE tagv) { const char *tag; notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); #if !defined(RSTRING_PTR) #define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined(RSTRING_PTR) */ - SafeStringValue(tagv); - tag = RSTRING_PTR(tagv); + SafeStringValue (tagv); + tag = RSTRING_PTR (tagv); - ret = notmuch_message_remove_tag(message, tag); - notmuch_rb_status_raise(ret); + ret = notmuch_message_remove_tag (message, tag); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -288,15 +288,15 @@ notmuch_rb_message_remove_tag(VALUE self, VALUE tagv) * Remove all tags of the 'message' */ VALUE -notmuch_rb_message_remove_all_tags(VALUE self) +notmuch_rb_message_remove_all_tags (VALUE self) { notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - ret = notmuch_message_remove_all_tags(message); - notmuch_rb_status_raise(ret); + ret = notmuch_message_remove_all_tags (message); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -304,18 +304,18 @@ notmuch_rb_message_remove_all_tags(VALUE self) /* * call-seq: MESSAGE.maildir_flags_to_tags => true * - * Add/remove tags according to maildir flags in the message filename(s) + * Add/remove tags according to maildir flags in the message filename (s) */ VALUE -notmuch_rb_message_maildir_flags_to_tags(VALUE self) +notmuch_rb_message_maildir_flags_to_tags (VALUE self) { notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - ret = notmuch_message_maildir_flags_to_tags(message); - notmuch_rb_status_raise(ret); + ret = notmuch_message_maildir_flags_to_tags (message); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -323,18 +323,18 @@ notmuch_rb_message_maildir_flags_to_tags(VALUE self) /* * call-seq: MESSAGE.tags_to_maildir_flags => true * - * Rename message filename(s) to encode tags as maildir flags + * Rename message filename (s) to encode tags as maildir flags */ VALUE -notmuch_rb_message_tags_to_maildir_flags(VALUE self) +notmuch_rb_message_tags_to_maildir_flags (VALUE self) { notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - ret = notmuch_message_tags_to_maildir_flags(message); - notmuch_rb_status_raise(ret); + ret = notmuch_message_tags_to_maildir_flags (message); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -345,15 +345,15 @@ notmuch_rb_message_tags_to_maildir_flags(VALUE self) * Freeze the 'message' */ VALUE -notmuch_rb_message_freeze(VALUE self) +notmuch_rb_message_freeze (VALUE self) { notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - ret = notmuch_message_freeze(message); - notmuch_rb_status_raise(ret); + ret = notmuch_message_freeze (message); + notmuch_rb_status_raise (ret); return Qtrue; } @@ -364,15 +364,15 @@ notmuch_rb_message_freeze(VALUE self) * Thaw a 'message' */ VALUE -notmuch_rb_message_thaw(VALUE self) +notmuch_rb_message_thaw (VALUE self) { notmuch_status_t ret; notmuch_message_t *message; - Data_Get_Notmuch_Message(self, message); + Data_Get_Notmuch_Message (self, message); - ret = notmuch_message_thaw(message); - notmuch_rb_status_raise(ret); + ret = notmuch_message_thaw (message); + notmuch_rb_status_raise (ret); return Qtrue; } diff --git a/bindings/ruby/messages.c b/bindings/ruby/messages.c index faf41a3b..443a30c9 100644 --- a/bindings/ruby/messages.c +++ b/bindings/ruby/messages.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 @@ -26,14 +26,14 @@ * Destroys the messages, freeing all resources allocated for it. */ VALUE -notmuch_rb_messages_destroy(VALUE self) +notmuch_rb_messages_destroy (VALUE self) { notmuch_messages_t *messages; - Data_Get_Notmuch_Messages(self, messages); + Data_Get_Notmuch_Messages (self, messages); - notmuch_messages_destroy(messages); - DATA_PTR(self) = NULL; + notmuch_messages_destroy (messages); + DATA_PTR (self) = NULL; return Qnil; } @@ -44,16 +44,16 @@ notmuch_rb_messages_destroy(VALUE self) * parameter. */ VALUE -notmuch_rb_messages_each(VALUE self) +notmuch_rb_messages_each (VALUE self) { notmuch_message_t *message; notmuch_messages_t *messages; - Data_Get_Notmuch_Messages(self, messages); + Data_Get_Notmuch_Messages (self, messages); - for (; notmuch_messages_valid(messages); notmuch_messages_move_to_next(messages)) { - message = notmuch_messages_get(messages); - rb_yield(Data_Wrap_Struct(notmuch_rb_cMessage, NULL, NULL, message)); + for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { + message = notmuch_messages_get (messages); + rb_yield (Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message)); } return self; @@ -65,16 +65,16 @@ notmuch_rb_messages_each(VALUE self) * Collect tags from the messages */ VALUE -notmuch_rb_messages_collect_tags(VALUE self) +notmuch_rb_messages_collect_tags (VALUE self) { notmuch_tags_t *tags; notmuch_messages_t *messages; - Data_Get_Notmuch_Messages(self, messages); + Data_Get_Notmuch_Messages (self, messages); - tags = notmuch_messages_collect_tags(messages); + tags = notmuch_messages_collect_tags (messages); 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_Struct (notmuch_rb_cTags, NULL, NULL, tags); } diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c index 6a70f192..74fd5858 100644 --- a/bindings/ruby/query.c +++ b/bindings/ruby/query.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 @@ -26,14 +26,14 @@ * Destroys the query, freeing all resources allocated for it. */ VALUE -notmuch_rb_query_destroy(VALUE self) +notmuch_rb_query_destroy (VALUE self) { notmuch_query_t *query; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - notmuch_query_destroy(query); - DATA_PTR(self) = NULL; + notmuch_query_destroy (query); + DATA_PTR (self) = NULL; return Qnil; } @@ -44,13 +44,13 @@ notmuch_rb_query_destroy(VALUE self) * Get sort type of the +QUERY+ */ VALUE -notmuch_rb_query_get_sort(VALUE self) +notmuch_rb_query_get_sort (VALUE self) { notmuch_query_t *query; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - return FIX2INT(notmuch_query_get_sort(query)); + return FIX2INT (notmuch_query_get_sort (query)); } /* @@ -59,16 +59,16 @@ notmuch_rb_query_get_sort(VALUE self) * Set sort type of the +QUERY+ */ VALUE -notmuch_rb_query_set_sort(VALUE self, VALUE sortv) +notmuch_rb_query_set_sort (VALUE self, VALUE sortv) { notmuch_query_t *query; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - if (!FIXNUM_P(sortv)) - rb_raise(rb_eTypeError, "Not a Fixnum"); + if (!FIXNUM_P (sortv)) + rb_raise (rb_eTypeError, "Not a Fixnum"); - notmuch_query_set_sort(query, FIX2UINT(sortv)); + notmuch_query_set_sort (query, FIX2UINT (sortv)); return Qnil; } @@ -79,13 +79,13 @@ notmuch_rb_query_set_sort(VALUE self, VALUE sortv) * Get query string of the +QUERY+ */ VALUE -notmuch_rb_query_get_string(VALUE self) +notmuch_rb_query_get_string (VALUE self) { notmuch_query_t *query; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - return rb_str_new2(notmuch_query_get_query_string(query)); + return rb_str_new2 (notmuch_query_get_query_string (query)); } /* @@ -94,18 +94,18 @@ notmuch_rb_query_get_string(VALUE self) * Search for threads */ VALUE -notmuch_rb_query_search_threads(VALUE self) +notmuch_rb_query_search_threads (VALUE self) { notmuch_query_t *query; notmuch_threads_t *threads; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - threads = notmuch_query_search_threads(query); + threads = notmuch_query_search_threads (query); if (!threads) - rb_raise(notmuch_rb_eMemoryError, "Out of memory"); + rb_raise (notmuch_rb_eMemoryError, "Out of memory"); - return Data_Wrap_Struct(notmuch_rb_cThreads, NULL, NULL, threads); + return Data_Wrap_Struct (notmuch_rb_cThreads, NULL, NULL, threads); } /* @@ -114,16 +114,16 @@ notmuch_rb_query_search_threads(VALUE self) * Search for messages */ VALUE -notmuch_rb_query_search_messages(VALUE self) +notmuch_rb_query_search_messages (VALUE self) { notmuch_query_t *query; notmuch_messages_t *messages; - Data_Get_Notmuch_Query(self, query); + Data_Get_Notmuch_Query (self, query); - messages = notmuch_query_search_messages(query); + messages = notmuch_query_search_messages (query); 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_Struct (notmuch_rb_cMessages, NULL, NULL, messages); } diff --git a/bindings/ruby/status.c b/bindings/ruby/status.c index a2bd61a7..b11fb9fb 100644 --- a/bindings/ruby/status.c +++ b/bindings/ruby/status.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 @@ -21,31 +21,31 @@ #include "defs.h" void -notmuch_rb_status_raise(notmuch_status_t status) +notmuch_rb_status_raise (notmuch_status_t status) { switch (status) { case NOTMUCH_STATUS_SUCCESS: case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: - break; + break; case NOTMUCH_STATUS_OUT_OF_MEMORY: - rb_raise(notmuch_rb_eMemoryError, "out of memory"); + rb_raise (notmuch_rb_eMemoryError, "out of memory"); case NOTMUCH_STATUS_READ_ONLY_DATABASE: - rb_raise(notmuch_rb_eReadOnlyError, "read-only database"); + rb_raise (notmuch_rb_eReadOnlyError, "read-only database"); case NOTMUCH_STATUS_XAPIAN_EXCEPTION: - rb_raise(notmuch_rb_eXapianError, "xapian exception"); + rb_raise (notmuch_rb_eXapianError, "xapian exception"); case NOTMUCH_STATUS_FILE_ERROR: - rb_raise(notmuch_rb_eFileError, "failed to read/write file"); + rb_raise (notmuch_rb_eFileError, "failed to read/write file"); case NOTMUCH_STATUS_FILE_NOT_EMAIL: - rb_raise(notmuch_rb_eFileNotEmailError, "file not email"); + rb_raise (notmuch_rb_eFileNotEmailError, "file not email"); case NOTMUCH_STATUS_NULL_POINTER: - rb_raise(notmuch_rb_eNullPointerError, "null pointer"); + rb_raise (notmuch_rb_eNullPointerError, "null pointer"); case NOTMUCH_STATUS_TAG_TOO_LONG: - rb_raise(notmuch_rb_eTagTooLongError, "tag too long"); + rb_raise (notmuch_rb_eTagTooLongError, "tag too long"); case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW: - rb_raise(notmuch_rb_eUnbalancedFreezeThawError, "unbalanced freeze/thaw"); + rb_raise (notmuch_rb_eUnbalancedFreezeThawError, "unbalanced freeze/thaw"); case NOTMUCH_STATUS_UNBALANCED_ATOMIC: - rb_raise(notmuch_rb_eUnbalancedAtomicError, "unbalanced atomic"); + rb_raise (notmuch_rb_eUnbalancedAtomicError, "unbalanced atomic"); default: - rb_raise(notmuch_rb_eBaseError, "unknown notmuch error"); + rb_raise (notmuch_rb_eBaseError, "unknown notmuch error"); } } diff --git a/bindings/ruby/tags.c b/bindings/ruby/tags.c index f0a2f45e..e8226ad7 100644 --- a/bindings/ruby/tags.c +++ b/bindings/ruby/tags.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 @@ -26,14 +26,14 @@ * Destroys the tags, freeing all resources allocated for it. */ VALUE -notmuch_rb_tags_destroy(VALUE self) +notmuch_rb_tags_destroy (VALUE self) { notmuch_tags_t *tags; - Data_Get_Notmuch_Tags(self, tags); + Data_Get_Notmuch_Tags (self, tags); - notmuch_tags_destroy(tags); - DATA_PTR(self) = NULL; + notmuch_tags_destroy (tags); + DATA_PTR (self) = NULL; return Qnil; } @@ -45,16 +45,16 @@ notmuch_rb_tags_destroy(VALUE self) * parameter. */ VALUE -notmuch_rb_tags_each(VALUE self) +notmuch_rb_tags_each (VALUE self) { const char *tag; notmuch_tags_t *tags; - Data_Get_Notmuch_Tags(self, tags); + Data_Get_Notmuch_Tags (self, tags); - for (; notmuch_tags_valid(tags); notmuch_tags_move_to_next(tags)) { - tag = notmuch_tags_get(tags); - rb_yield(rb_str_new2(tag)); + for (; notmuch_tags_valid (tags); notmuch_tags_move_to_next (tags)) { + tag = notmuch_tags_get (tags); + rb_yield (rb_str_new2 (tag)); } return self; diff --git a/bindings/ruby/thread.c b/bindings/ruby/thread.c index d10c924d..efe5aaf7 100644 --- a/bindings/ruby/thread.c +++ b/bindings/ruby/thread.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 @@ -26,14 +26,14 @@ * Destroys the thread, freeing all resources allocated for it. */ VALUE -notmuch_rb_thread_destroy(VALUE self) +notmuch_rb_thread_destroy (VALUE self) { notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - notmuch_thread_destroy(thread); - DATA_PTR(self) = NULL; + notmuch_thread_destroy (thread); + DATA_PTR (self) = NULL; return Qnil; } @@ -44,16 +44,16 @@ notmuch_rb_thread_destroy(VALUE self) * Returns the thread id */ VALUE -notmuch_rb_thread_get_thread_id(VALUE self) +notmuch_rb_thread_get_thread_id (VALUE self) { const char *tid; notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - tid = notmuch_thread_get_thread_id(thread); + tid = notmuch_thread_get_thread_id (thread); - return rb_str_new2(tid); + return rb_str_new2 (tid); } /* @@ -62,13 +62,13 @@ notmuch_rb_thread_get_thread_id(VALUE self) * Returns the number of total messages */ VALUE -notmuch_rb_thread_get_total_messages(VALUE self) +notmuch_rb_thread_get_total_messages (VALUE self) { notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - return INT2FIX(notmuch_thread_get_total_messages(thread)); + return INT2FIX (notmuch_thread_get_total_messages (thread)); } /* @@ -77,18 +77,18 @@ notmuch_rb_thread_get_total_messages(VALUE self) * Get a Notmuch::Messages iterator for the top level messages in thread. */ VALUE -notmuch_rb_thread_get_toplevel_messages(VALUE self) +notmuch_rb_thread_get_toplevel_messages (VALUE self) { notmuch_messages_t *messages; notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - messages = notmuch_thread_get_toplevel_messages(thread); + messages = notmuch_thread_get_toplevel_messages (thread); 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_Struct (notmuch_rb_cMessages, NULL, NULL, messages); } /* @@ -97,13 +97,13 @@ notmuch_rb_thread_get_toplevel_messages(VALUE self) * Get the number of messages in thread that matched the search */ VALUE -notmuch_rb_thread_get_matched_messages(VALUE self) +notmuch_rb_thread_get_matched_messages (VALUE self) { notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - return INT2FIX(notmuch_thread_get_matched_messages(thread)); + return INT2FIX (notmuch_thread_get_matched_messages (thread)); } /* @@ -112,16 +112,16 @@ notmuch_rb_thread_get_matched_messages(VALUE self) * Get a comma-separated list of the names of the authors. */ VALUE -notmuch_rb_thread_get_authors(VALUE self) +notmuch_rb_thread_get_authors (VALUE self) { const char *authors; notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - authors = notmuch_thread_get_authors(thread); + authors = notmuch_thread_get_authors (thread); - return rb_str_new2(authors); + return rb_str_new2 (authors); } /* @@ -130,16 +130,16 @@ notmuch_rb_thread_get_authors(VALUE self) * Returns the subject of the thread */ VALUE -notmuch_rb_thread_get_subject(VALUE self) +notmuch_rb_thread_get_subject (VALUE self) { const char *subject; notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - subject = notmuch_thread_get_subject(thread); + subject = notmuch_thread_get_subject (thread); - return rb_str_new2(subject); + return rb_str_new2 (subject); } /* @@ -148,13 +148,13 @@ notmuch_rb_thread_get_subject(VALUE self) * Get the date of the oldest message in thread. */ VALUE -notmuch_rb_thread_get_oldest_date(VALUE self) +notmuch_rb_thread_get_oldest_date (VALUE self) { notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - return UINT2NUM(notmuch_thread_get_oldest_date(thread)); + return UINT2NUM (notmuch_thread_get_oldest_date (thread)); } /* @@ -163,13 +163,13 @@ notmuch_rb_thread_get_oldest_date(VALUE self) * Get the date of the newest message in thread. */ VALUE -notmuch_rb_thread_get_newest_date(VALUE self) +notmuch_rb_thread_get_newest_date (VALUE self) { notmuch_thread_t *thread; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - return UINT2NUM(notmuch_thread_get_newest_date(thread)); + return UINT2NUM (notmuch_thread_get_newest_date (thread)); } /* @@ -178,16 +178,16 @@ notmuch_rb_thread_get_newest_date(VALUE self) * Get a Notmuch::Tags iterator for the tags of the thread */ VALUE -notmuch_rb_thread_get_tags(VALUE self) +notmuch_rb_thread_get_tags (VALUE self) { notmuch_thread_t *thread; notmuch_tags_t *tags; - Data_Get_Notmuch_Thread(self, thread); + Data_Get_Notmuch_Thread (self, thread); - tags = notmuch_thread_get_tags(thread); + tags = notmuch_thread_get_tags (thread); 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_Struct (notmuch_rb_cTags, NULL, NULL, tags); } diff --git a/bindings/ruby/threads.c b/bindings/ruby/threads.c index ccf59f8e..3e1fbf5d 100644 --- a/bindings/ruby/threads.c +++ b/bindings/ruby/threads.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 @@ -26,14 +26,14 @@ * Destroys the threads, freeing all resources allocated for it. */ VALUE -notmuch_rb_threads_destroy(VALUE self) +notmuch_rb_threads_destroy (VALUE self) { notmuch_threads_t *threads; - Data_Get_Struct(self, notmuch_threads_t, threads); + Data_Get_Struct (self, notmuch_threads_t, threads); - notmuch_threads_destroy(threads); - DATA_PTR(self) = NULL; + notmuch_threads_destroy (threads); + DATA_PTR (self) = NULL; return Qnil; } @@ -44,16 +44,16 @@ notmuch_rb_threads_destroy(VALUE self) * parameter. */ VALUE -notmuch_rb_threads_each(VALUE self) +notmuch_rb_threads_each (VALUE self) { notmuch_thread_t *thread; notmuch_threads_t *threads; - Data_Get_Notmuch_Threads(self, threads); + Data_Get_Notmuch_Threads (self, threads); - for (; notmuch_threads_valid(threads); notmuch_threads_move_to_next(threads)) { - thread = notmuch_threads_get(threads); - rb_yield(Data_Wrap_Struct(notmuch_rb_cThread, NULL, NULL, thread)); + for (; notmuch_threads_valid (threads); notmuch_threads_move_to_next (threads)) { + thread = notmuch_threads_get (threads); + rb_yield (Data_Wrap_Struct (notmuch_rb_cThread, NULL, NULL, thread)); } return self; -- 2.43.0