From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id A4E3D6DE16F4 for ; Wed, 22 Mar 2017 04:23:28 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.005 X-Spam-Level: X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5 tests=[AWL=0.006, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SijpJcWcsfka for ; Wed, 22 Mar 2017 04:23:28 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id E796E6DE160E for ; Wed, 22 Mar 2017 04:23:18 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1cqeLb-0000h2-6e; Wed, 22 Mar 2017 07:22:35 -0400 Received: (nullmailer pid 12128 invoked by uid 1000); Wed, 22 Mar 2017 11:23:11 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 3/7] lib/index: Add another layer of indirection in filtering Date: Wed, 22 Mar 2017 08:23:02 -0300 Message-Id: <20170322112306.12060-4-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170322112306.12060-1-david@tethera.net> References: <20170322112306.12060-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 11:23:28 -0000 We could add a second gmime filter subclass, but prefer to avoid duplicating the boilerplate. --- lib/index.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/index.cc b/lib/index.cc index 1c04cc3d..74a750b9 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -29,6 +29,8 @@ typedef struct _NotmuchFilterDiscardUuencode NotmuchFilterDiscardUuencode; typedef struct _NotmuchFilterDiscardUuencodeClass NotmuchFilterDiscardUuencodeClass; +typedef void (*filter_fun) (GMimeFilter *filter, char *in, size_t len, size_t prespace, + char **out, size_t *outlen, size_t *outprespace); /** * NotmuchFilterDiscardUuencode: * @@ -57,6 +59,7 @@ typedef struct _NotmuchFilterDiscardUuencodeClass NotmuchFilterDiscardUuencodeCl struct _NotmuchFilterDiscardUuencode { GMimeFilter parent_object; GMimeContentType *content_type; + filter_fun real_filter; int state; }; @@ -110,7 +113,14 @@ filter_copy (GMimeFilter *gmime_filter) static void filter_filter (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t prespace, - char **outbuf, size_t *outlen, size_t *outprespace) + char **outbuf, size_t *outlen, size_t *outprespace) { + NotmuchFilterDiscardUuencode *filter = (NotmuchFilterDiscardUuencode *) gmime_filter; + (*filter->real_filter)(gmime_filter, inbuf, inlen, prespace, outbuf, outlen, outprespace); +} + +static void +filter_filter_uuencode (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t prespace, + char **outbuf, size_t *outlen, size_t *outprespace) { NotmuchFilterDiscardUuencode *filter = (NotmuchFilterDiscardUuencode *) gmime_filter; register const char *inptr = inbuf; @@ -223,7 +233,7 @@ notmuch_filter_discard_uuencode_new (GMimeContentType *content_type) filter = (NotmuchFilterDiscardUuencode *) g_object_newv (type, 0, NULL); filter->state = 0; filter->content_type = content_type; - + filter->real_filter = filter_filter_uuencode; return (GMimeFilter *) filter; } -- 2.11.0