From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YsP/GXKsj2BiBwEAgWs5BA (envelope-from ) for ; Mon, 03 May 2021 09:55:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QGwHFXKsj2CALAAAbx9fmQ (envelope-from ) for ; Mon, 03 May 2021 07:55:30 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 B31FB13587 for ; Mon, 3 May 2021 09:55:29 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A2D55271F1; Mon, 3 May 2021 03:55:11 -0400 (EDT) Received: from mail-oo1-xc30.google.com (mail-oo1-xc30.google.com [IPv6:2607:f8b0:4864:20::c30]) by mail.notmuchmail.org (Postfix) with ESMTPS id DF31D1FAC2 for ; Mon, 3 May 2021 03:55:05 -0400 (EDT) Received: by mail-oo1-xc30.google.com with SMTP id h9-20020a4a94090000b02901f9d4f64172so1061498ooi.5 for ; Mon, 03 May 2021 00:55:05 -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=GwWXimNLBYRM312obDwVq0oBFFraiasA+RBdhPkaJ8U=; b=CSegYrsxcbJ+hPkSXNPDnaZAFady+MPQi8VArSITTFQnOWwEhh0KQoxcXMzfR+KV+0 SDPeiY/feM6LXJ66GFyLWMTVF/b1CP9QnEEo/BTqYvfx5uQO0Dkqp0uZXmAgQji506qx mpNDyytzVkuPIFsSHo5pEz1q/04dMqUXlRvVvNXzQNwN7DXprXl8Xi+rNuLjGtxYTRxy +l12UL7YOoI+YCEKVHDEkmtR4f9dWEFMCwbR+WAEqHV2wGFtGHzVp4cXUfOpyCg0tvcT wQ7z3mWVynOKUvuHuuQRiMpdY0ChXzF7lgnfPBay0ilT/QyEk49MCf7MHpEu2ijo1lbQ 0ZJQ== 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=GwWXimNLBYRM312obDwVq0oBFFraiasA+RBdhPkaJ8U=; b=ANdvm3Fqs4SFrMKoF6ghw+TzuIUUCRLBOr1SsApSd4tOa6vRT5ovMrjmAv2eul9yle JtWVvnPdui1/4dl7tBfBWUYsn8DTRTPXlP/i5drX+r06yyv8ZA1RLbI2I0yKuXYoXpi7 9Pa2CJpdvZB/N/yXW3PYG24uHvR2JFYF8Io56+GfwurGDBeHzLHktIE572LL1xjRvKOX CGeFrXImNSPmQ7dRpA49anGIvkx1EyrD+5pZQezz+LneF6dMTPouU752YqutcVE4ra60 7k2X5B/nt5YXXKEOjIJFshKYscCBbd6PdhZLJ9bGp2l7LhICcjnAlQY9FD8r0L/CIY7j Vjsg== X-Gm-Message-State: AOAM5331RubP0aaVVRHnDVNXawJrOYJ+kPmwyh97MvEAWzYyqAl2Zrz4 5CCtCHq8H9ZsDcJKOKugvR9HRAFyHQYQ2g== X-Google-Smtp-Source: ABdhPJyz2KzalNHihayU0f1gZ4p+W6LTCoAzjS/klYKmwfp7K0W3TUdnzP6bjbiOVT1yjS0aOMlxRw== X-Received: by 2002:a4a:dc5:: with SMTP id 188mr12278774oob.80.1620028504525; Mon, 03 May 2021 00:55:04 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id z9sm2777832otj.44.2021.05.03.00.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 00:55:04 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 3/3] ruby: simplify data get helper Date: Mon, 3 May 2021 02:54:57 -0500 Message-Id: <20210503075457.649056-4-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: FZHXFV57JWJ4ZWIKLHX773NVM2SNXKAA X-Message-ID-Hash: FZHXFV57JWJ4ZWIKLHX773NVM2SNXKAA 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=1620028530; 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=h5ZtP1MJlmJVePv93ok8bydSAbathKCkdkGcUcAy8u8=; b=eb8Q+PuqfxCCQr9ssFGhIFydLUJTZsCRldEtVjW1R0lGPH18YHffklz3zCBFocDz2npu9o U2a5veYKGaq4EMDvLWeGlhIM1Hi1CFdDQVmB81L3+XolmK21RGovWHQRWtNqyiYncntbR1 GW7JNI0gKduz081jXDAG0tBzi7bb4NoWaRnZsBm8pi/bQN2UusrbMYed+utT8lmRg1bux/ rs+pq6vyI457DUBYns2/XzV4ZZdnLrPZj8CmjokXkrKp0aGRGp/nGT52L9awyFj3UZBslT 7Le7PjcIHiAsq4xeZDL2grfoXHN8gunFF2nBEM2Kc6CyWkfmy2V5IF5OnUHZWA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620028530; a=rsa-sha256; cv=none; b=uugNqEHu/d324BbhmCvEG5AMf5qnHSvlHJRvbCODEnwsmrUzw6631pBaoDkyOYH1YriYBm kIyb4TRYUhJMXxieShJalkoOIyeis7Y14Rdx89h3b3ETzjpWH7r7RlFaK6k3zoNOsCmcJZ YAdPngXJ0wAKS4hCewQuRin3r4YOqPrzIASNhdoegarGRk4jmvvgBbWL6SLxAExJrtXPqX SPoeQQGVxDr5/Nw7oM3Xs/omN5BRaryz59JdZlEEGOru1XnesqpBqGWpUEyTsNQzYOg2FB vt3+35iaj7zGDInImhntVk5/jDjtVzZxDEK4GuJRjMtGvQ+t928MDouE+scTrg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=CSegYrsx; 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 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=CSegYrsx; 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 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: B31FB13587 X-Spam-Score: 0.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: uA8z79QnkHR4 The type is not actually needed. Signed-off-by: Felipe Contreras --- bindings/ruby/defs.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 46e2caf8..edbcc729 100644 --- a/bindings/ruby/defs.h +++ b/bindings/ruby/defs.h @@ -55,39 +55,39 @@ extern ID ID_db_mode; # define RSTRING_PTR(v) (RSTRING((v))->ptr) #endif /* !defined (RSTRING_PTR) */ -#define Data_Get_Notmuch_Object(obj, type, message, ptr) \ +#define Data_Get_Notmuch_Object(obj, message, ptr) \ do { \ - Data_Get_Struct ((obj), type, (ptr)); \ + (ptr) = rb_data_object_get (obj); \ if (!(ptr)) \ rb_raise (rb_eRuntimeError, (message)); \ } while (0) #define Data_Get_Notmuch_Database(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_database_t, "database closed", (ptr)) + Data_Get_Notmuch_Object ((obj), "database closed", (ptr)) #define Data_Get_Notmuch_Directory(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_directory_t, "directory destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "directory destroyed", (ptr)) #define Data_Get_Notmuch_FileNames(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_filenames_t, "filenames destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "filenames destroyed", (ptr)) #define Data_Get_Notmuch_Query(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_query_t, "query destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "query destroyed", (ptr)) #define Data_Get_Notmuch_Threads(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_threads_t, "threads destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "threads destroyed", (ptr)) #define Data_Get_Notmuch_Messages(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_messages_t, "messages destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "messages destroyed", (ptr)) #define Data_Get_Notmuch_Thread(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_thread_t, "thread destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "thread destroyed", (ptr)) #define Data_Get_Notmuch_Message(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_message_t, "message destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "message destroyed", (ptr)) #define Data_Get_Notmuch_Tags(obj, ptr) \ - Data_Get_Notmuch_Object ((obj), notmuch_tags_t, "tags destroyed", (ptr)) + Data_Get_Notmuch_Object ((obj), "tags destroyed", (ptr)) /* status.c */ void -- 2.31.0