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 wMBnNU4DkWCEcAAAgWs5BA (envelope-from ) for ; Tue, 04 May 2021 10:18:22 +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 gGD4ME4DkWDgEgAAB5/wlQ (envelope-from ) for ; Tue, 04 May 2021 08:18:22 +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 6A50E116A0 for ; Tue, 4 May 2021 10:18:22 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 3D3F627DFA; Tue, 4 May 2021 04:18:10 -0400 (EDT) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by mail.notmuchmail.org (Postfix) with ESMTPS id CFCF727DF4 for ; Tue, 4 May 2021 04:18:06 -0400 (EDT) Received: by mail-ot1-x336.google.com with SMTP id q7-20020a9d57870000b02902a5c2bd8c17so6864266oth.5 for ; Tue, 04 May 2021 01:18:06 -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=sLjgqdcv9UBd+Q/nb+yVdeSwPVR40Gv518+dQtVeWv8sNbP5WK8er1bhF/RX2zFofl TPv/qryzto21ie0GR/0pSCkMAMSuCGWDfGS6F4sIuPtdlur9WnsI2P02n3CfmATHCypo mRWGHo/afpbhWqYWpkecmRRJ8wiaS868KJa6XwOhKFyToV0Zor2wd2NzC0r/mD7FP/ps 4f4fYW6BbynVn3ixxFfjr9ZQBeIzMANo+/EXSatnz14Jc24QN0d1tK5aWFKQg+bHxtdu PZLU+GFDb06gTDEIARWovywY5yc7oKcPwu+heFKhATi8oVfvBr3kh5MgcgdtVclVOhob O9sA== 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=VkSwic7uNvxfc4ahMz0AuNYZrKxYvur8ue6so+TXksDQD/rmq3MmZ1ZixOxPOzhkwy UeEPriHmKjQY4rVV6wa418tzpM8x376bwmiW1MGlm8j2FFUHEU3PQ7PmouVjY8xhN77E ovUZTxKFo4jdbkJ2+MptlVSjwf2gmb+t6UdxGrkqLlkZlkaF8BQe3bGBZleQTokzSPF4 wdc5hdefGKSGWvq6EZkrxkKOmCkFnoiIWQXXOM3/QM0XMV20tM+qL7omE1xsUeSVY29S YQiZqOqJ9mz11gkhj8RaPzSAmWlyFky770dwqQnG7QEdHihpAq0RFLs3PWuP+CN02nIl xafw== X-Gm-Message-State: AOAM533lNSIEomptlIVwBSHQ5r7raDt6ngBqxa9+2CCXr/3iBWJxxU4Y CSLTZt5lddvkb/ocU3LEvzVlD5y1Bi/YTQ== X-Google-Smtp-Source: ABdhPJxku0CIGWZvBAg9TK6IhHlp5tEOToqjT/6rFwcOkGr2+X604BS4DLRyxlZqtInzxYSB7HntDQ== X-Received: by 2002:a9d:907:: with SMTP id 7mr12547718otp.326.1620116284721; Tue, 04 May 2021 01:18:04 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id p1sm624651otk.58.2021.05.04.01.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 01:18:04 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH v2 02/10] ruby: improve all Data_Get_Notmuch_* helpers Date: Tue, 4 May 2021 03:17:41 -0500 Message-Id: <20210504081749.715768-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210504081749.715768-1-felipe.contreras@gmail.com> References: <20210504081749.715768-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: EX4HCUTLTZHJTMIHIODGYMYVWKKRC3IT X-Message-ID-Hash: EX4HCUTLTZHJTMIHIODGYMYVWKKRC3IT 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 , Austin Clements , Tomi Ollila , Ludovic LANGE , Daniel Kahn Gillmor 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=1620116302; 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=dKvJF52LoDmEJf0pbXFAKIUFrhSv6GeoemvqlPrrLe0zyHz5Geuxqh5cJtryT61mjoQeGX AUGe30yCLDdLrUTZEt2rBo4Muf+5x49bA5z05ThvEuTxgyobaw39MrKJJt5ixLKz8QrsTt pXWAdL3nISrRRZgD6+I5DOVAXCNwXsiawPDp1NEgbgA/6CibU7hkuzhvAZvVDQ0Ly/I815 9kj0/ztKweER6EQ6cWJpDI3hxCRkGZbmEqtD1IfUBX5I1rvqSnLZ6IsWyJrveJIiUwXytW EjpC6m+yffIx47cUcMeKm65dQbz7bKPRmTubpSsrh4Zg7ENRQcRKpgyX0y/duA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620116302; a=rsa-sha256; cv=none; b=CNN95v0aOy5zCUzWEvSAV8quyS9aLWl6jgxH875ZaS7Avn4MvUmErK5n0ZOqYSdyMtu9Z4 zBHktWTZdgXSkCWdVITN0ChrLFWFDElTDeK25DeX7EYTq86O92kD/z9U6VvLK29ypUpt55 9hBlZ+wbHZ3322yOSGehcMUgg5MojNcJCreUoMomnKgURhmbe4RFnEtLz0wloqlkCIPvlr icsHWOrrOojv3AY5var677OqfFUEVulcqTP00pB3aAvu2XjvsIKiQl3t6CBOkJYLUgXWmw 1jb/MFzH81ekcj7JmMqoT3bzV/WpW7FIX8KUS3P5Q4Trrx9Soy78s5dLVWu9Qw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=sLjgqdcv; 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=sLjgqdcv; 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: 6A50E116A0 X-Spam-Score: 0.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: ais6jpnU5zKY 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