From a4eae6c20458067a6a25899eda9db06e7ac03b4d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 4 Nov 2014 00:50:15 +0100 Subject: [PATCH] [PATCH v2 03/10] cli: search: Convert ctx. to ctx-> --- e1/3b880c0eaa2ea4939a229fc6bf868d2554e37a | 251 ++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 e1/3b880c0eaa2ea4939a229fc6bf868d2554e37a diff --git a/e1/3b880c0eaa2ea4939a229fc6bf868d2554e37a b/e1/3b880c0eaa2ea4939a229fc6bf868d2554e37a new file mode 100644 index 000000000..3b0920827 --- /dev/null +++ b/e1/3b880c0eaa2ea4939a229fc6bf868d2554e37a @@ -0,0 +1,251 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0DA50431FAF + for ; Mon, 3 Nov 2014 15:51:23 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 2EnuzhFVxXVt for ; + Mon, 3 Nov 2014 15:51:19 -0800 (PST) +Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) + by olra.theworths.org (Postfix) with ESMTP id 44996429E36 + for ; Mon, 3 Nov 2014 15:50:53 -0800 (PST) +Received: from localhost (unknown [192.168.200.7]) + by max.feld.cvut.cz (Postfix) with ESMTP id BCD885CD005 + for ; Tue, 4 Nov 2014 00:50:52 +0100 (CET) +X-Virus-Scanned: IMAP STYX AMAVIS +Received: from max.feld.cvut.cz ([192.168.200.1]) + by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, + port 10044) with ESMTP id uoK5k0-pv_uy for ; + Tue, 4 Nov 2014 00:50:46 +0100 (CET) +Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) + by max.feld.cvut.cz (Postfix) with ESMTP id E58255CD00D + for ; Tue, 4 Nov 2014 00:50:40 +0100 (CET) +Received: from wsh by steelpick.2x.cz with local (Exim 4.84) + (envelope-from ) + id 1XlROM-0005WU-2w; Tue, 04 Nov 2014 00:50:34 +0100 +From: Michal Sojka +To: notmuch@notmuchmail.org +Subject: [PATCH v2 03/10] cli: search: Convert ctx. to ctx-> +Date: Tue, 4 Nov 2014 00:50:15 +0100 +Message-Id: <1415058622-21162-4-git-send-email-sojkam1@fel.cvut.cz> +X-Mailer: git-send-email 2.1.1 +In-Reply-To: <1415058622-21162-1-git-send-email-sojkam1@fel.cvut.cz> +References: <1415058622-21162-1-git-send-email-sojkam1@fel.cvut.cz> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 03 Nov 2014 23:51:23 -0000 + +Mostly text replacement. +--- + notmuch-search.c | 81 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 41 insertions(+), 40 deletions(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index 3d2012b..6765a16 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -474,7 +474,7 @@ do_search_tags (const search_context_t *ctx) + int + notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { +- search_context_t ctx = { ++ search_context_t search_context = { + .format_sel = NOTMUCH_FORMAT_TEXT, + .exclude = NOTMUCH_EXCLUDE_TRUE, + .sort = NOTMUCH_SORT_NEWEST_FIRST, +@@ -483,23 +483,24 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + .limit = -1, /* unlimited */ + .dupe = -1, + }; ++ search_context_t *ctx = &search_context; + char *query_str; + int opt_index, ret; + unsigned int i; + + notmuch_opt_desc_t options[] = { +- { NOTMUCH_OPT_KEYWORD, &ctx.sort, "sort", 's', ++ { NOTMUCH_OPT_KEYWORD, &ctx->sort, "sort", 's', + (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, + { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, + { 0, 0 } } }, +- { NOTMUCH_OPT_KEYWORD, &ctx.format_sel, "format", 'f', ++ { NOTMUCH_OPT_KEYWORD, &ctx->format_sel, "format", 'f', + (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, + { "sexp", NOTMUCH_FORMAT_SEXP }, + { "text", NOTMUCH_FORMAT_TEXT }, + { "text0", NOTMUCH_FORMAT_TEXT0 }, + { 0, 0 } } }, + { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, +- { NOTMUCH_OPT_KEYWORD_FLAGS, &ctx.output, "output", 'o', ++ { NOTMUCH_OPT_KEYWORD_FLAGS, &ctx->output, "output", 'o', + (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, + { "threads", OUTPUT_THREADS }, + { "messages", OUTPUT_MESSAGES }, +@@ -508,15 +509,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { "files", OUTPUT_FILES }, + { "tags", OUTPUT_TAGS }, + { 0, 0 } } }, +- { NOTMUCH_OPT_KEYWORD, &ctx.exclude, "exclude", 'x', ++ { NOTMUCH_OPT_KEYWORD, &ctx->exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, + { "false", NOTMUCH_EXCLUDE_FALSE }, + { "flag", NOTMUCH_EXCLUDE_FLAG }, + { "all", NOTMUCH_EXCLUDE_ALL }, + { 0, 0 } } }, +- { NOTMUCH_OPT_INT, &ctx.offset, "offset", 'O', 0 }, +- { NOTMUCH_OPT_INT, &ctx.limit, "limit", 'L', 0 }, +- { NOTMUCH_OPT_INT, &ctx.dupe, "duplicate", 'D', 0 }, ++ { NOTMUCH_OPT_INT, &ctx->offset, "offset", 'O', 0 }, ++ { NOTMUCH_OPT_INT, &ctx->limit, "limit", 'L', 0 }, ++ { NOTMUCH_OPT_INT, &ctx->dupe, "duplicate", 'D', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -524,31 +525,31 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + if (opt_index < 0) + return EXIT_FAILURE; + +- if (! ctx.output) +- ctx.output = OUTPUT_SUMMARY; ++ if (! ctx->output) ++ ctx->output = OUTPUT_SUMMARY; + +- if (ctx.output != OUTPUT_FILES && ctx.output != OUTPUT_MESSAGES && +- ctx.dupe != -1) { ++ if (ctx->output != OUTPUT_FILES && ctx->output != OUTPUT_MESSAGES && ++ ctx->dupe != -1) { + fprintf (stderr, "Error: --duplicate=N is only supported with --output=files and --output=messages.\n"); + return EXIT_FAILURE; + } + +- switch (ctx.format_sel) { ++ switch (ctx->format_sel) { + case NOTMUCH_FORMAT_TEXT: +- ctx.format = sprinter_text_create (config, stdout); ++ ctx->format = sprinter_text_create (config, stdout); + break; + case NOTMUCH_FORMAT_TEXT0: +- if (ctx.output == OUTPUT_SUMMARY) { ++ if (ctx->output == OUTPUT_SUMMARY) { + fprintf (stderr, "Error: --format=text0 is not compatible with --output=summary.\n"); + return EXIT_FAILURE; + } +- ctx.format = sprinter_text0_create (config, stdout); ++ ctx->format = sprinter_text0_create (config, stdout); + break; + case NOTMUCH_FORMAT_JSON: +- ctx.format = sprinter_json_create (config, stdout); ++ ctx->format = sprinter_json_create (config, stdout); + break; + case NOTMUCH_FORMAT_SEXP: +- ctx.format = sprinter_sexp_create (config, stdout); ++ ctx->format = sprinter_sexp_create (config, stdout); + break; + default: + /* this should never happen */ +@@ -558,10 +559,10 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + notmuch_exit_if_unsupported_format (); + + if (notmuch_database_open (notmuch_config_get_database_path (config), +- NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx.notmuch)) ++ NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx->notmuch)) + return EXIT_FAILURE; + +- query_str = query_string_from_args (ctx.notmuch, argc-opt_index, argv+opt_index); ++ query_str = query_string_from_args (ctx->notmuch, argc-opt_index, argv+opt_index); + if (query_str == NULL) { + fprintf (stderr, "Out of memory.\n"); + return EXIT_FAILURE; +@@ -571,51 +572,51 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + +- ctx.query = notmuch_query_create (ctx.notmuch, query_str); +- if (ctx.query == NULL) { ++ ctx->query = notmuch_query_create (ctx->notmuch, query_str); ++ if (ctx->query == NULL) { + fprintf (stderr, "Out of memory\n"); + return EXIT_FAILURE; + } + +- notmuch_query_set_sort (ctx.query, ctx.sort); ++ notmuch_query_set_sort (ctx->query, ctx->sort); + +- if (ctx.exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) { ++ if (ctx->exclude == NOTMUCH_EXCLUDE_FLAG && ctx->output != OUTPUT_SUMMARY) { + /* If we are not doing summary output there is nowhere to + * print the excluded flag so fall back on including the + * excluded messages. */ + fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); +- ctx.exclude = NOTMUCH_EXCLUDE_FALSE; ++ ctx->exclude = NOTMUCH_EXCLUDE_FALSE; + } + +- if (ctx.exclude != NOTMUCH_EXCLUDE_FALSE) { ++ if (ctx->exclude != NOTMUCH_EXCLUDE_FALSE) { + const char **search_exclude_tags; + size_t search_exclude_tags_length; + + search_exclude_tags = notmuch_config_get_search_exclude_tags + (config, &search_exclude_tags_length); + for (i = 0; i < search_exclude_tags_length; i++) +- notmuch_query_add_tag_exclude (ctx.query, search_exclude_tags[i]); +- notmuch_query_set_omit_excluded (ctx.query, ctx.exclude); ++ notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]); ++ notmuch_query_set_omit_excluded (ctx->query, ctx->exclude); + } + +- if (ctx.output == OUTPUT_SUMMARY || +- ctx.output == OUTPUT_THREADS) +- ret = do_search_threads (&ctx); +- else if (ctx.output == OUTPUT_MESSAGES || +- ctx.output == OUTPUT_FILES || +- (ctx.output & OUTPUT_ADDRESS_FLAGS && !(ctx.output & ~OUTPUT_ADDRESS_FLAGS))) +- ret = do_search_messages (&ctx); +- else if (ctx.output == OUTPUT_TAGS) +- ret = do_search_tags (&ctx); ++ if (ctx->output == OUTPUT_SUMMARY || ++ ctx->output == OUTPUT_THREADS) ++ ret = do_search_threads (ctx); ++ else if (ctx->output == OUTPUT_MESSAGES || ++ ctx->output == OUTPUT_FILES || ++ (ctx->output & OUTPUT_ADDRESS_FLAGS && !(ctx->output & ~OUTPUT_ADDRESS_FLAGS))) ++ ret = do_search_messages (ctx); ++ else if (ctx->output == OUTPUT_TAGS) ++ ret = do_search_tags (ctx); + else { + fprintf (stderr, "Error: the combination of outputs is not supported.\n"); + ret = 1; + } + +- notmuch_query_destroy (ctx.query); +- notmuch_database_destroy (ctx.notmuch); ++ notmuch_query_destroy (ctx->query); ++ notmuch_database_destroy (ctx->notmuch); + +- talloc_free (ctx.format); ++ talloc_free (ctx->format); + + return ret ? EXIT_FAILURE : EXIT_SUCCESS; + } +-- +2.1.1 + -- 2.26.2