Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id B3B76431FB6 for ; Sun, 9 Dec 2012 09:17:32 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.098 X-Spam-Level: X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DnDgq+9+RSTy for ; Sun, 9 Dec 2012 09:17:30 -0800 (PST) Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 71C6C431FAF for ; Sun, 9 Dec 2012 09:17:30 -0800 (PST) Received: from smtp.qmul.ac.uk ([138.37.6.40]) by mail2.qmul.ac.uk with esmtp (Exim 4.71) (envelope-from ) id 1ThkVI-0005zO-K3; Sun, 09 Dec 2012 17:17:27 +0000 Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1ThkVI-0005Nj-A1; Sun, 09 Dec 2012 17:17:24 +0000 From: Mark Walters To: David Bremner , notmuch@notmuchmail.org Subject: Re: v5 of Batch-tag dump/restore patches In-Reply-To: <877gorqtai.fsf@zancas.localnet> References: <1355007421-3069-1-git-send-email-david@tethera.net> <877gorqtai.fsf@zancas.localnet> User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1 (x86_64-pc-linux-gnu) Date: Sun, 09 Dec 2012 17:17:27 +0000 Message-ID: <878v97m9g8.fsf@qmul.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Sender-Host-Address: 93.97.24.31 X-QM-SPAM-Info: Sender has good ham record. :) X-QM-Body-MD5: 7ee3ce6dd7f646595db74e1f2106261e (of first 20000 bytes) X-SpamAssassin-Score: -1.8 X-SpamAssassin-SpamBar: - X-SpamAssassin-Report: The QM spam filters have analysed this message to determine if it is spam. We require at least 5.0 points to mark a message as spam. This message scored -1.8 points. Summary of the scoring: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [138.37.6.40 listed in list.dnswl.org] * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (markwalters1009[at]gmail.com) * 0.5 AWL AWL: From: address is in the auto white-list X-QM-Scan-Virus: ClamAV says the message is clean X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Sun, 09 Dec 2012 17:17:32 -0000 This series looks good to me too. +1 Best wishes Mark On Sun, 09 Dec 2012, David Bremner wrote: > david@tethera.net writes: > >> Yet another version. Luckily we all use threaded mailreaders, right? >> > > A few fixups Jani mentioned in IRC: > > commit 4cbd366d3cd29b5d26b36f3744c26b0853b23437 > Author: David Bremner > Date: Sun Dec 9 08:49:29 2012 -0400 > > remove unused sigatomic_t from notmuch-restore > > I guess this must be cut and paste error from Jani's notmuch-tag code > > diff --git a/notmuch-restore.c b/notmuch-restore.c > index dba882b..40596a8 100644 > --- a/notmuch-restore.c > +++ b/notmuch-restore.c > @@ -23,7 +23,6 @@ > #include "tag-util.h" > #include "string-util.h" > > -static volatile sig_atomic_t interrupted; > static regex_t regex; > > static int > > commit 75b2fab1874fc9f0bab514fe832cfd85d1319877 > Author: David Bremner > Date: Sun Dec 9 08:47:12 2012 -0400 > > enum fixup for tag-utils > > diff --git a/tag-util.c b/tag-util.c > index e7233ab..eab482f 100644 > --- a/tag-util.c > +++ b/tag-util.c > @@ -16,7 +16,7 @@ struct _tag_op_list_t { > size_t size; > }; > > -static int > +static tag_parse_status_t > line_error (tag_parse_status_t status, > const char *line, > const char *format, ...) > @@ -31,7 +31,7 @@ line_error (tag_parse_status_t status, > return status; > } > > -int > +tag_parse_status_t > parse_tag_line (void *ctx, char *line, > tag_op_flag_t flags, > char **query_string, > @@ -56,7 +56,7 @@ parse_tag_line (void *ctx, char *line, > > /* Skip empty and comment lines. */ > if (*tok == '\0' || *tok == '#') { > - ret = 2; > + ret = TAG_PARSE_SKIPPED; > goto DONE; > } > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch