From: Jani Nikula <jani@nikula.org>
To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH v4 01/12] tag-util: move out 'tag' command-line checks
Date: Sun, 31 Mar 2013 13:00:26 +0300 [thread overview]
Message-ID: <87ip47sxc5.fsf@nikula.org> (raw)
In-Reply-To: <1359029288-12132-2-git-send-email-novalazy@gmail.com>
On Thu, 24 Jan 2013, Peter Wang <novalazy@gmail.com> wrote:
> parse_tag_command_line checked for two error conditions which are
> specific to the 'tag' command. It can be reused for the forthcoming
> notmuch 'insert' command if we move the checks out, into notmuch-tag.c.
FYI, this patch no longer applies to master.
Jani.
> ---
> notmuch-tag.c | 10 ++++++++++
> tag-util.c | 11 +++--------
> 2 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/notmuch-tag.c b/notmuch-tag.c
> index d9daf8f..a901dad 100644
> --- a/notmuch-tag.c
> +++ b/notmuch-tag.c
> @@ -234,6 +234,16 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
> if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,
> &query_string, tag_ops))
> return 1;
> +
> + if (tag_op_list_size (tag_ops) == 0) {
> + fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
> + return 1;
> + }
> +
> + if (*query_string == '\0') {
> + fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
> + return 1;
> + }
> }
>
> config = notmuch_config_open (ctx, NULL, NULL);
> diff --git a/tag-util.c b/tag-util.c
> index 701d329..743d591 100644
> --- a/tag-util.c
> +++ b/tag-util.c
> @@ -188,16 +188,11 @@ parse_tag_command_line (void *ctx, int argc, char **argv,
> tag_op_list_append (tag_ops, argv[i] + 1, is_remove);
> }
>
> - if (tag_op_list_size (tag_ops) == 0) {
> - fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
> - return TAG_PARSE_INVALID;
> - }
> -
> *query_str = query_string_from_args (ctx, argc - i, &argv[i]);
>
> - if (*query_str == NULL || **query_str == '\0') {
> - fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
> - return TAG_PARSE_INVALID;
> + if (*query_str == NULL) {
> + fprintf (stderr, "Out of memory.\n");
> + return TAG_PARSE_OUT_OF_MEMORY;
> }
>
> return TAG_PARSE_SUCCESS;
> --
> 1.7.12.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-03-31 10:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 12:07 [PATCH v4 00/12] insert command Peter Wang
2013-01-24 12:07 ` [PATCH v4 01/12] tag-util: move out 'tag' command-line checks Peter Wang
2013-03-31 10:00 ` Jani Nikula [this message]
2013-01-24 12:07 ` [PATCH v4 02/12] tag-util: do not reset list in parse_tag_command_line Peter Wang
2013-01-24 12:07 ` [PATCH v4 03/12] cli: add insert command Peter Wang
2013-03-06 1:13 ` David Bremner
2013-01-24 12:08 ` [PATCH v4 04/12] man: document 'insert' command Peter Wang
2013-03-29 23:25 ` David Bremner
2013-01-24 12:08 ` [PATCH v4 05/12] man: reference notmuch-insert.1 Peter Wang
2013-01-24 12:08 ` [PATCH v4 06/12] test: add tests for insert Peter Wang
2013-03-29 23:59 ` David Bremner
2013-03-30 4:05 ` Peter Wang
2013-04-01 19:38 ` Jani Nikula
2013-01-24 12:08 ` [PATCH v4 07/12] insert: add --folder option Peter Wang
2013-01-24 12:08 ` [PATCH v4 08/12] man: document insert " Peter Wang
2013-01-24 12:08 ` [PATCH v4 09/12] test: test " Peter Wang
2013-01-24 12:08 ` [PATCH v4 10/12] insert: add --create-folder option Peter Wang
2013-01-24 12:08 ` [PATCH v4 11/12] man: document insert --create-folder Peter Wang
2013-01-24 12:08 ` [PATCH v4 12/12] test: test insert --create-folder option Peter Wang
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=87ip47sxc5.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=novalazy@gmail.com \
/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).