From: Jani Nikula Date: Mon, 6 Feb 2012 19:57:21 +0000 (+0200) Subject: [PATCH v2 1/3] cli: use notmuch_bool_t for boolean fields in notmuch_show_params_t X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9518201a1e02ecca21be668d7c71f5dfc8b98ac8;p=notmuch-archives.git [PATCH v2 1/3] cli: use notmuch_bool_t for boolean fields in notmuch_show_params_t --- diff --git a/e6/0a06c703354815d29a5243c7f03714603d40d2 b/e6/0a06c703354815d29a5243c7f03714603d40d2 new file mode 100644 index 000000000..5213ba838 --- /dev/null +++ b/e6/0a06c703354815d29a5243c7f03714603d40d2 @@ -0,0 +1,187 @@ +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 AC135431FBC + for ; Mon, 6 Feb 2012 11:57:35 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 y0CgQFvXVhNG for ; + Mon, 6 Feb 2012 11:57:31 -0800 (PST) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C8B54431FAF + for ; Mon, 6 Feb 2012 11:57:30 -0800 (PST) +Received: by mail-lpp01m010-f53.google.com with SMTP id d3so3838995lah.26 + for ; Mon, 06 Feb 2012 11:57:30 -0800 (PST) +Received: by 10.112.49.201 with SMTP id w9mr5234450lbn.23.1328558250377; + Mon, 06 Feb 2012 11:57:30 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. + [84.248.80.253]) + by mx.google.com with ESMTPS id i9sm13798872lbz.3.2012.02.06.11.57.28 + (version=SSLv3 cipher=OTHER); Mon, 06 Feb 2012 11:57:29 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/3] cli: use notmuch_bool_t for boolean fields in + notmuch_show_params_t +Date: Mon, 6 Feb 2012 21:57:21 +0200 +Message-Id: + +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: +References: + + +In-Reply-To: +References: +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, 06 Feb 2012 19:57:36 -0000 + +Use notmuch_bool_t instead of int for entire_thread, raw, and decrypt +boolean fields in notmuch_show_params_t. No functional changes. + +Signed-off-by: Jani Nikula +--- + notmuch-client.h | 6 +++--- + notmuch-reply.c | 7 +++---- + notmuch-show.c | 14 +++++++------- + 3 files changed, 13 insertions(+), 14 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index e0eb594..60828aa 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -98,15 +98,15 @@ typedef struct notmuch_show_format { + } notmuch_show_format_t; + + typedef struct notmuch_show_params { +- int entire_thread; +- int raw; ++ notmuch_bool_t entire_thread; ++ notmuch_bool_t raw; + int part; + #ifdef GMIME_ATLEAST_26 + GMimeCryptoContext* cryptoctx; + #else + GMimeCipherContext* cryptoctx; + #endif +- int decrypt; ++ notmuch_bool_t decrypt; + } notmuch_show_params_t; + + /* There's no point in continuing when we've detected that we've done +diff --git a/notmuch-reply.c b/notmuch-reply.c +index f55b1d2..6b244e6 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -661,7 +661,6 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + notmuch_show_params_t params = { .part = -1 }; + int format = FORMAT_DEFAULT; + int reply_all = TRUE; +- notmuch_bool_t decrypt = FALSE; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &format, "format", 'f', +@@ -672,7 +671,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + (notmuch_keyword_t []){ { "all", TRUE }, + { "sender", FALSE }, + { 0, 0 } } }, +- { NOTMUCH_OPT_BOOLEAN, &decrypt, "decrypt", 'd', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -687,7 +686,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + else + reply_format_func = notmuch_reply_format_default; + +- if (decrypt) { ++ if (params.decrypt) { + #ifdef GMIME_ATLEAST_26 + /* TODO: GMimePasswordRequestFunc */ + params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); +@@ -697,8 +696,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + #endif + if (params.cryptoctx) { + g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); +- params.decrypt = TRUE; + } else { ++ params.decrypt = FALSE; + fprintf (stderr, "Failed to construct gpg context.\n"); + } + #ifndef GMIME_ATLEAST_26 +diff --git a/notmuch-show.c b/notmuch-show.c +index dec799c..e04b3cc 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1063,11 +1063,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + int format_specified = 0; + int i; + +- params.entire_thread = 0; +- params.raw = 0; ++ params.entire_thread = FALSE; ++ params.raw = FALSE; + params.part = -1; + params.cryptoctx = NULL; +- params.decrypt = 0; ++ params.decrypt = FALSE; + + argc--; argv++; /* skip subcommand argument */ + +@@ -1082,13 +1082,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + format = &format_text; + } else if (strcmp (opt, "json") == 0) { + format = &format_json; +- params.entire_thread = 1; ++ params.entire_thread = TRUE; + } else if (strcmp (opt, "mbox") == 0) { + format = &format_mbox; + mbox = 1; + } else if (strcmp (opt, "raw") == 0) { + format = &format_raw; +- params.raw = 1; ++ params.raw = TRUE; + } else { + fprintf (stderr, "Invalid value for --format: %s\n", opt); + return 1; +@@ -1097,7 +1097,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + } else if (STRNCMP_LITERAL (argv[i], "--part=") == 0) { + params.part = atoi(argv[i] + sizeof ("--part=") - 1); + } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { +- params.entire_thread = 1; ++ params.entire_thread = TRUE; + } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || + (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { + if (params.cryptoctx == NULL) { +@@ -1117,7 +1117,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + #endif + } + if (STRNCMP_LITERAL (argv[i], "--decrypt") == 0) +- params.decrypt = 1; ++ params.decrypt = TRUE; + } else { + fprintf (stderr, "Unrecognized option: %s\n", argv[i]); + return 1; +-- +1.7.5.4 +