debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: make notmuch count --exclude a boolean argument

Browse source 
Commit 0f314c0c99 ("cli: convert notmuch_bool_t to stdbool")
over-eagerly converted EXCLUDE_TRUE and EXCLUDE_FALSE to EXCLUDE_true
and EXCLUDE_false in notmuch-count.c. We could just fix the case back,
but convert the option to an actual boolean argument instead.

We've used a keyword argument rather than a boolean argument for
notmuch count --exclude for five years, since commit 785c1e497f
("cli: move count to the new --exclude=(true|false|flag) naming
scheme."), "to allow future options to be added more easily". I think
we can conclude future options aren't coming any time soon.
This commit is contained in:
Jani Nikula 2017-10-14 23:18:36 +03:00 committed by David Bremner
parent bcd6229d26
commit ab8b40f7e3
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
notmuch-count.c
View file

@ -27,12 +27,6 @@ enum {
OUTPUT_FILES, OUTPUT_FILES,
}; };
/* The following is to allow future options to be added more easily */
enum {
EXCLUDE_true,
EXCLUDE_false,
};
/* Return the number of files matching the query, or -1 for an error */ /* Return the number of files matching the query, or -1 for an error */
static int static int
count_files (notmuch_query_t *query) count_files (notmuch_query_t *query)
@ -160,7 +154,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
char *query_str; char *query_str;
int opt_index; int opt_index;
int output = OUTPUT_MESSAGES; int output = OUTPUT_MESSAGES;
int exclude = EXCLUDE_true; bool exclude = true;
const char **search_exclude_tags = NULL; const char **search_exclude_tags = NULL;
size_t search_exclude_tags_length = 0; size_t search_exclude_tags_length = 0;
bool batch = false; bool batch = false;
@ -175,10 +169,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
{ "messages", OUTPUT_MESSAGES }, { "messages", OUTPUT_MESSAGES },
{ "files", OUTPUT_FILES }, { "files", OUTPUT_FILES },
{ 0, 0 } } }, { 0, 0 } } },
{ .opt_keyword = &exclude, .name = "exclude", .keywords = { .opt_bool = &exclude, .name = "exclude" },
(notmuch_keyword_t []){ { "true", EXCLUDE_true },
{ "false", EXCLUDE_false },
{ 0, 0 } } },
{ .opt_bool = &print_lastmod, .name = "lastmod" }, { .opt_bool = &print_lastmod, .name = "lastmod" },
{ .opt_bool = &batch, .name = "batch" }, { .opt_bool = &batch, .name = "batch" },
{ .opt_string = &input_file_name, .name = "input" }, { .opt_string = &input_file_name, .name = "input" },
@ -221,7 +212,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (exclude == EXCLUDE_true) { if (exclude) {
search_exclude_tags = notmuch_config_get_search_exclude_tags search_exclude_tags = notmuch_config_get_search_exclude_tags
(config, &search_exclude_tags_length); (config, &search_exclude_tags_length);
} }