From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 30D60431FAF for ; Sun, 9 Dec 2012 05:46:40 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 Nizs77uSK8jy for ; Sun, 9 Dec 2012 05:46:36 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 1D127431FAE for ; Sun, 9 Dec 2012 05:46:35 -0800 (PST) Received: by mail-lb0-f181.google.com with SMTP id ge1so1527379lbb.26 for ; Sun, 09 Dec 2012 05:46:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type:x-gm-message-state; bh=QjntaOw+oi5z8X2leR27WWjUEmbFeWcxcgwcn4xhD9k=; b=QvHcmHuny//m0Ln/AFqGm2zmkVaazzB9f9/c5YJUXylpONfiYbAUSzFXvwxoiWD2kp QMEz1xZ+PXBVD55YNxPzbQs/4FT5oBEbNVVLujC+G9yrbw8efpUkAJaE+fDaXZqzHg5s +8Q7hdcBw8GWfbMHraMIBk8xIcG3DhP6Bm2XgWpXD+ygLMVKIS0wLvAo0OUJaGMXoCCz f3Cokfvn12UhIR0ox7dFbXH0Z8NAO5UH39MHJ+1yhIiIUScMFZ9Aj27M3UQS3VO0eudQ dhMqnfN9ZSKiwGDI4owhe4HXIcZ740jl+9oPitIcrPdA8CM5BSHOGJjq92Lb6VRvGz6j gMkg== Received: by 10.152.45.229 with SMTP id q5mr10771462lam.34.1355060794302; Sun, 09 Dec 2012 05:46:34 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id ps11sm6597781lab.12.2012.12.09.05.46.32 (version=SSLv3 cipher=OTHER); Sun, 09 Dec 2012 05:46:33 -0800 (PST) From: Jani Nikula 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+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Sun, 09 Dec 2012 15:46:31 +0200 Message-ID: <87y5h7s5hk.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Gm-Message-State: ALoCoQk4KgMt20/xYLqdDBAB/bnPGeu6UX/aSVBAsKy3ZY4cEhMHrpqfx6zrjbD/iP2OHu1kWOfb 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 13:46:40 -0000 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: The series with fixups LGTM. Jani. > > 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