debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: use notmuch_exclude_t in option parser

Browse source 
Use notmuch_exclude_t constants directly instead of a redundant
enumeration while parsing search --exclude keyword arguments.
This commit is contained in:
Peter Wang 2013-05-11 20:50:09 +01:00 committed by David Bremner
parent d29d7e1ee2
commit 0e035e1ccd
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
notmuch-search.c
View file

@ -283,13 +283,6 @@ do_search_tags (notmuch_database_t *notmuch,
return 0; return 0;
} }
enum {
EXCLUDE_TRUE,
EXCLUDE_FALSE,
EXCLUDE_FLAG,
EXCLUDE_ALL
};
int int
notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
{ {
@ -302,7 +295,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
output_t output = OUTPUT_SUMMARY; output_t output = OUTPUT_SUMMARY;
int offset = 0; int offset = 0;
int limit = -1; /* unlimited */ int limit = -1; /* unlimited */
int exclude = EXCLUDE_TRUE; notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE;
unsigned int i; unsigned int i;
enum { enum {
@ -332,10 +325,10 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
{ "tags", OUTPUT_TAGS }, { "tags", OUTPUT_TAGS },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
(notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },
{ "false", EXCLUDE_FALSE }, { "false", NOTMUCH_EXCLUDE_FALSE },
{ "flag", EXCLUDE_FLAG }, { "flag", NOTMUCH_EXCLUDE_FLAG },
{ "all", EXCLUDE_ALL }, { "all", NOTMUCH_EXCLUDE_ALL },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
{ NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
@ -394,15 +387,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
notmuch_query_set_sort (query, sort); notmuch_query_set_sort (query, sort);
if (exclude == EXCLUDE_FLAG && output != OUTPUT_SUMMARY) { if (exclude == NOTMUCH_EXCLUDE_FLAG && output != OUTPUT_SUMMARY) {
/* If we are not doing summary output there is nowhere to /* If we are not doing summary output there is nowhere to
* print the excluded flag so fall back on including the * print the excluded flag so fall back on including the
* excluded messages. */ * excluded messages. */
fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n");
exclude = EXCLUDE_FALSE; exclude = NOTMUCH_EXCLUDE_FALSE;
} }
if (exclude != EXCLUDE_FALSE) { if (exclude != NOTMUCH_EXCLUDE_FALSE) {
const char **search_exclude_tags; const char **search_exclude_tags;
size_t search_exclude_tags_length; size_t search_exclude_tags_length;
@ -410,10 +403,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
(config, &search_exclude_tags_length); (config, &search_exclude_tags_length);
for (i = 0; i < search_exclude_tags_length; i++) for (i = 0; i < search_exclude_tags_length; i++)
notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
if (exclude == EXCLUDE_FLAG) notmuch_query_set_omit_excluded (query, exclude);
notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_FLAG);
if (exclude == EXCLUDE_ALL)
notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_ALL);
} }
switch (output) { switch (output) {