debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 03:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: extract count printing to a separate function in notmuch count

Browse source 
Make count printing on a query string reusable. No functional changes.
This commit is contained in:
Jani Nikula 2013-03-31 12:45:59 +03:00 committed by David Bremner
parent ab65c365d5
commit 530b562111
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
notmuch-count.c
View file

@ -32,16 +32,47 @@ enum {
EXCLUDE_FALSE, EXCLUDE_FALSE,
}; };
static int
print_count (notmuch_database_t *notmuch, const char *query_str,
const char **exclude_tags, size_t exclude_tags_length, int output)
{
notmuch_query_t *query;
size_t i;
query = notmuch_query_create (notmuch, query_str);
if (query == NULL) {
fprintf (stderr, "Out of memory\n");
return 1;
}
for (i = 0; i < exclude_tags_length; i++)
notmuch_query_add_tag_exclude (query, exclude_tags[i]);
switch (output) {
case OUTPUT_MESSAGES:
printf ("%u\n", notmuch_query_count_messages (query));
break;
case OUTPUT_THREADS:
printf ("%u\n", notmuch_query_count_threads (query));
break;
}
notmuch_query_destroy (query);
return 0;
}
int int
notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
{ {
notmuch_database_t *notmuch; notmuch_database_t *notmuch;
notmuch_query_t *query;
char *query_str; char *query_str;
int opt_index; int opt_index;
int output = OUTPUT_MESSAGES; int output = OUTPUT_MESSAGES;
int exclude = EXCLUDE_TRUE; int exclude = EXCLUDE_TRUE;
unsigned int i; const char **search_exclude_tags = NULL;
size_t search_exclude_tags_length = 0;
int ret;
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_KEYWORD, &output, "output", 'o', { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
@ -71,33 +102,15 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
return 1; return 1;
} }
query = notmuch_query_create (notmuch, query_str);
if (query == NULL) {
fprintf (stderr, "Out of memory\n");
return 1;
}
if (exclude == EXCLUDE_TRUE) { if (exclude == EXCLUDE_TRUE) {
const char **search_exclude_tags;
size_t search_exclude_tags_length;
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);
for (i = 0; i < search_exclude_tags_length; i++)
notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
} }
switch (output) { ret = print_count (notmuch, query_str, search_exclude_tags,
case OUTPUT_MESSAGES: search_exclude_tags_length, output);
printf ("%u\n", notmuch_query_count_messages (query));
break;
case OUTPUT_THREADS:
printf ("%u\n", notmuch_query_count_threads (query));
break;
}
notmuch_query_destroy (query);
notmuch_database_destroy (notmuch); notmuch_database_destroy (notmuch);
return 0; return ret;
} }