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

create notmuch_show_params_t structure for holding parameters passed to show functions.

Browse source 
This simplifies the passing of arguments to the show functions.  This
will be very useful as we accumulate more parameters that will need to
be passed.  Currently only the entire_thread parameter is passed this
way.
This commit is contained in:
Jameson Graef Rollins 2011-05-20 15:01:52 -07:00 committed by Carl Worth
parent 04927208fa
commit d2177d0b22
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
notmuch-client.h
View file

@ -75,6 +75,10 @@ typedef struct notmuch_show_format {
const char *message_set_end; const char *message_set_end;
} notmuch_show_format_t; } notmuch_show_format_t;
typedef struct notmuch_show_params {
int entire_thread;
} notmuch_show_params_t;
/* There's no point in continuing when we've detected that we've done /* There's no point in continuing when we've detected that we've done
* something wrong internally (as opposed to the user passing in a * something wrong internally (as opposed to the user passing in a
* bogus value). * bogus value).

25
notmuch-show.c
View file

@ -524,7 +524,7 @@ show_messages (void *ctx,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
notmuch_messages_t *messages, notmuch_messages_t *messages,
int indent, int indent,
notmuch_bool_t entire_thread) notmuch_show_params_t *params)
{ {
notmuch_message_t *message; notmuch_message_t *message;
notmuch_bool_t match; notmuch_bool_t match;
@ -549,15 +549,18 @@ show_messages (void *ctx,
next_indent = indent; next_indent = indent;
if (match || entire_thread) { if (match || params->entire_thread) {
show_message (ctx, format, message, indent); show_message (ctx, format, message, indent);
next_indent = indent + 1; next_indent = indent + 1;
fputs (format->message_set_sep, stdout); fputs (format->message_set_sep, stdout);
} }
show_messages (ctx, format, notmuch_message_get_replies (message), show_messages (ctx,
next_indent, entire_thread); format,
notmuch_message_get_replies (message),
next_indent,
params);
notmuch_message_destroy (message); notmuch_message_destroy (message);
@ -618,7 +621,7 @@ static int
do_show (void *ctx, do_show (void *ctx,
notmuch_query_t *query, notmuch_query_t *query,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
int entire_thread) notmuch_show_params_t *params)
{ {
notmuch_threads_t *threads; notmuch_threads_t *threads;
notmuch_thread_t *thread; notmuch_thread_t *thread;
@ -643,7 +646,7 @@ do_show (void *ctx,
fputs (format->message_set_sep, stdout); fputs (format->message_set_sep, stdout);
first_toplevel = 0; first_toplevel = 0;
show_messages (ctx, format, messages, 0, entire_thread); show_messages (ctx, format, messages, 0, params);
notmuch_thread_destroy (thread); notmuch_thread_destroy (thread);
@ -663,10 +666,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
char *query_string; char *query_string;
char *opt; char *opt;
const notmuch_show_format_t *format = &format_text; const notmuch_show_format_t *format = &format_text;
int entire_thread = 0; notmuch_show_params_t params;
int i; int i;
int raw = 0; int raw = 0;
params.entire_thread = 0;
for (i = 0; i < argc && argv[i][0] == '-'; i++) { for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (strcmp (argv[i], "--") == 0) { if (strcmp (argv[i], "--") == 0) {
i++; i++;
@ -678,7 +683,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
format = &format_text; format = &format_text;
} else if (strcmp (opt, "json") == 0) { } else if (strcmp (opt, "json") == 0) {
format = &format_json; format = &format_json;
entire_thread = 1; params.entire_thread = 1;
} else if (strcmp (opt, "mbox") == 0) { } else if (strcmp (opt, "mbox") == 0) {
format = &format_mbox; format = &format_mbox;
} else if (strcmp (opt, "raw") == 0) { } else if (strcmp (opt, "raw") == 0) {
@ -688,7 +693,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
return 1; return 1;
} }
} else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {
entire_thread = 1; params.entire_thread = 1;
} else { } else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]); fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1; return 1;
@ -727,7 +732,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
if (raw) if (raw)
return do_show_raw (ctx, query); return do_show_raw (ctx, query);
else else
return do_show (ctx, query, format, entire_thread); return do_show (ctx, query, format, &params);
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_close (notmuch);