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 567CC431FAF for ; Sun, 9 Dec 2012 04:55:47 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 at5CM-zh3+C3 for ; Sun, 9 Dec 2012 04:55:46 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0403A431FAE for ; Sun, 9 Dec 2012 04:55:45 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1ThgQ4-0006or-QK; Sun, 09 Dec 2012 08:55:45 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1ThgPd-0006nm-RI; Sun, 09 Dec 2012 08:55:17 -0400 From: David Bremner To: notmuch@notmuchmail.org Subject: Re: v5 of Batch-tag dump/restore patches In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net> References: <1355007421-3069-1-git-send-email-david@tethera.net> User-Agent: Notmuch/0.14+151~g9a98977 (http://notmuchmail.org) Emacs/24.1.1 (x86_64-pc-linux-gnu) Date: Sun, 09 Dec 2012 08:55:17 -0400 Message-ID: <877gorqtai.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: text/plain X-Spam_bar: - 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 12:55:47 -0000 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; }