From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 2/3] notmuch-restore: replace continue with if
Date: Sun, 16 Dec 2012 16:16:36 -0400 [thread overview]
Message-ID: <1355688997-19164-3-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1355688997-19164-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
It is maybe a bit counter-intuitive with the condition reversed like
this, but it makes the memory handling fix in the next patch easier.
---
notmuch-restore.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/notmuch-restore.c b/notmuch-restore.c
index ae0ef45..4b76d83 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -228,12 +228,15 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
}
}
- if (ret > 0)
- continue;
-
- if (ret < 0 || tag_message (ctx, notmuch, query_string,
- tag_ops, flags))
- break;
+ if (ret <= 0) {
+ if (ret < 0)
+ break;
+
+ ret = tag_message (line_ctx, notmuch, query_string,
+ tag_ops, flags);
+ if (ret < 0)
+ break;
+ }
} while ((line_len = getline (&line, &line_size, input)) != -1);
--
1.7.10.4
next prev parent reply other threads:[~2012-12-16 20:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 20:16 proposed fix for memory leak in notmuch restore david
2012-12-16 20:16 ` [PATCH 1/3] tag-utils: use the tag_opt_list_t as talloc context, if possible david
2012-12-16 20:16 ` david [this message]
2012-12-16 20:16 ` [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for each line parsed david
2012-12-16 22:41 ` Jani Nikula
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=1355688997-19164-3-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.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).