From: David Bremner <david@tethera.net>
To: notmuch@freelists.org, notmuch@notmuchmail.org
Subject: [PATCH 2/6] lib/index: Add another layer of indirection in filtering
Date: Wed, 10 May 2017 08:39:06 -0300 [thread overview]
Message-ID: <20170510113910.28444-3-david@tethera.net> (raw)
In-Reply-To: <20170510113910.28444-1-david@tethera.net>
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
next prev parent reply other threads:[~2017-05-10 11:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 11:39 v2 of drop HTML tags when indexing David Bremner
2017-05-10 11:39 ` [PATCH 1/6] lib: add content type argument to uuencode filter David Bremner
2017-05-10 11:39 ` David Bremner [this message]
2017-05-10 11:39 ` [PATCH 3/6] lib/index: separate state table definition from scanner David Bremner
2017-05-10 11:39 ` [PATCH 4/6] lib/index: generalize filter name David Bremner
2017-05-10 11:39 ` [PATCH 5/6] lib/index.cc: generalize filter state machine David Bremner
2017-05-10 11:39 ` [PATCH 6/6] lib/index: add simple html filter David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170510113910.28444-3-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@freelists.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).