From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uIx2CG6sj2AiCAEAgWs5BA (envelope-from ) for ; Mon, 03 May 2021 09:55:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KOYGBG6sj2BoMwAAB5/wlQ (envelope-from ) for ; Mon, 03 May 2021 07:55:26 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A590C1E238 for ; Mon, 3 May 2021 09:55:25 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id BF620271D9; Mon, 3 May 2021 03:55:09 -0400 (EDT) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by mail.notmuchmail.org (Postfix) with ESMTPS id 1ED33271D5 for ; Mon, 3 May 2021 03:55:04 -0400 (EDT) Received: by mail-ot1-x329.google.com with SMTP id g7-20020a9d5f870000b02902a5831ad705so4330152oti.10 for ; Mon, 03 May 2021 00:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JXUdoDz1BrpZeCy9/fp9/xxQWXGyEb8E6DAuWOMLjos=; b=aAQVSR5IfTK0VNYfYLi/55tdlP8vMBmAHnMkY4lsIZdDvqJ4OvS+XF8mdtMb1cdGWX p0GHknoTxAuTRXqNgFAmfkS0MM8mDjpo/Go2DEUKhxqrO4nqte1BTPQMHQj3d1X/+H3x qX3pH/cYbU1T3mANKOGhsdq9sWo0yAnnFGL4zgX+r3HuqHamPwHwEYskE5Ojk3HuTrn7 envvr2H+gGUIs+LYr87ErpOFTkx7n5uwxHqtQnzQ0DUrkvN1IxP8fFvo1UMIHAvLfrAn BBovtV64TnEHeF3/Kgr4BARCFtU1rd+V7NfEt4WR93A08CgsmOnY2EdwhgRfmNIewwEs JEeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JXUdoDz1BrpZeCy9/fp9/xxQWXGyEb8E6DAuWOMLjos=; b=osQhYA4m9/hQwy2aB49P8DJPLvQF5RF3uj1i8gz93amC1XAq9vq125n4zQf0W3GvIM CR5oJwAvS8EAvUF/d2lLFNkSA5kNeDZNduLfkkwvkFYWz8Nkf2kf0EeC9UTsx5YD07wp hWKMGydIR4JfPp/4Cw12wUKrhPAh29bKi9IghHZK/lDXPZCGCe+W6sJqBIdZqQi+8sXz GtJhMjh4GNEAS5PNA5DSKF5qdj/spZWj1kBGYWepWXa1Hq3n7rnRNlwprngamY6GRpSb wdenlkCNU75svDYyG1ZEMAGfwARCp1irxhx27HqzmM0R8bEyzGgCvt9cv5CQdBWAPKxU AlMA== X-Gm-Message-State: AOAM530HF4WB/YcsHZ+zEYTSPHnSFDm4NV5Qp5dLChlveRY1gPMcaxLo etj1rIjL7VeIAwfbeO7zQa0s/8+nTrSTaw== X-Google-Smtp-Source: ABdhPJwONuJQEZXvQ/3cV+JmH3vi/EPRB1ug8+Qj/rqQ7+RxBu6eBBsOe/7axbuJQ/MpKKAT6EBe5w== X-Received: by 2002:a05:6830:1d98:: with SMTP id y24mr14002205oti.164.1620028501391; Mon, 03 May 2021 00:55:01 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id w66sm2592923ooa.37.2021.05.03.00.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 00:55:01 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 1/3] ruby: improve all Data_Get_Notmuch_* helpers Date: Mon, 3 May 2021 02:54:55 -0500 Message-Id: <20210503075457.649056-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210503075457.649056-1-felipe.contreras@gmail.com> References: <20210503075457.649056-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: J6J6OJKKTJHYLV4DNMP725VEGZSIG6KN X-Message-ID-Hash: J6J6OJKKTJHYLV4DNMP725VEGZSIG6KN X-MailFrom: felipe.contreras@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Ali Polatel X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620028525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=8p9cTbKPwzRNZ63sKT9R4wfBMT7ZbyRssLQx3lGbGa8=; b=I2/nN4lwEb4qs7+CXHh0cGRo2GGpyo/L6Jl32da2tk3TAUyBDk8EvQYZukKNZNlv0tGxhN zGSvkZP+IlSFgNvmPpFoy6MOcfDx/Qwnkjl86+NyHgjf9u3SWhiynC9JeeesUXuZDbnecM Hl9rPU5qrghyDJhz8PxyB+JUAxuyp+awGlO9r3JqnYlNBVA/fRAfaoiWdc+kriKx4TOdBv BgWZ1txP8kJTvxHI5xoIOT/LoOiiVh/jF8lbhV1hfT3CWs9zk78m9cU/9wp/7efSVkxAex 3+kq69C+RFhXKqoJgCBwMvz/9NE6BokGfv/ot6mhlOxGXcQ3wGLWk2fqWnYh7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620028525; a=rsa-sha256; cv=none; b=bS+bn6N/i74+d9Rbj0TzWZAKcwVfVIFb3639MhvjKjs5pQ9bO3fHKU0K1u8/8x7rUT3xZh klKSzJ8lZGWXeNlJPl693NKFaFekXoxKtdSKDiH1go4Lrj+qDhQMk0IMc/MdANEC7iFS5L qaQifnT4vB68PzSbLtcFq7N48DA8sDRzC59evTgXO4vm/q7V6KC63qyua4qmrQYKZnYEqP wwzI/zM5SL9V0MinU116/klkmgNsrX3tMHOu24A0v5qt0uCbChl1UF9kwdES/tj6SqwTTG AvzUA6BoPShHqAqGNQUnxhICD6Uc4QCmSgT1W0d3/MSp4Dr5zeBbRbUJrsCf6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=aAQVSR5I; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=aAQVSR5I; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: A590C1E238 X-Spam-Score: 0.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: j/ceet1gLvWV There's no need to repeat the same code over and over. Signed-off-by: Felipe Contreras --- bindings/ruby/defs.h | 81 ++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 59 deletions(-) diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 48544ca2..e95ea239 100644 --- a/bindings/ruby/defs.h +++ b/bindings/ruby/defs.h @@ -55,77 +55,40 @@ extern ID ID_db_mode; # define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined (RSTRING_PTR) */ -#define Data_Get_Notmuch_Database(obj, ptr) \ +#define Data_Get_Notmuch_Object(obj, type, message, 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)); \ + rb_raise (rb_eRuntimeError, (message)); \ + Data_Get_Struct ((obj), type, (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_Database(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_database_t, "database closed", (ptr)) -#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_Directory(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_directory_t, "directory destroyed", (ptr)) -#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_FileNames(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_filenames_t, "filenames destroyed", (ptr)) -#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_Query(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_query_t, "query destroyed", (ptr)) -#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_Threads(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_threads_t, "threads destroyed", (ptr)) -#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_Messages(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_messages_t, "messages destroyed", (ptr)) -#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_Thread(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_thread_t, "thread destroyed", (ptr)) -#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_Message(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_message_t, "message destroyed", (ptr)) + +#define Data_Get_Notmuch_Tags(obj, ptr) \ + Data_Get_Notmuch_Object ((obj), notmuch_tags_t, "tags destroyed", (ptr)) /* status.c */ void -- 2.31.0