cli: use notmuch_bool_t for boolean fields in notmuch_show_params_t

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 <jani@nikula.org>

diff --git a/notmuch-client.h b/notmuch-client.h
index e0eb594ad0394510ecdd20e0a04ee1119f247775..60828aa40e24f5892aca2c9a380dca4d01d5f150 100644 (file)
--- 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 {
 } 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 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
 } 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 f55b1d22bbe2f1d5ed1603dafc3b7d2615715fa9..6b244e6dfa752c329363f0cbf7374d2582282f28 100644 (file)
--- 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_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',
 
     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_keyword_t []){ { "all", TRUE },
                                  { "sender", FALSE },
                                  { 0, 0 } } },

-       { NOTMUCH_OPT_BOOLEAN, &decrypt, "decrypt", 'd', 0 },
+       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },

        { 0, 0, 0, 0, 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;
 
     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");
 #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);
 #endif
        if (params.cryptoctx) {
            g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE);

-           params.decrypt = TRUE;

        } else {
        } else {

+           params.decrypt = FALSE;

            fprintf (stderr, "Failed to construct gpg context.\n");
        }
 #ifndef GMIME_ATLEAST_26
            fprintf (stderr, "Failed to construct gpg context.\n");
        }
 #ifndef GMIME_ATLEAST_26

diff --git a/notmuch-show.c b/notmuch-show.c
index 816e0f8cc781c1ac26f12b7e9a35687258067d75..13a6f549ab00bccfa21a47080a2248647c167aed 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1028,11 +1028,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     int format_specified = 0;
     int i;
 
     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.part = -1;
     params.cryptoctx = NULL;

-    params.decrypt = 0;
+    params.decrypt = FALSE;

 
     argc--; argv++; /* skip subcommand argument */
 
 
     argc--; argv++; /* skip subcommand argument */
 


@@ -1047,13 +1047,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
                format = &format_text;
            } else if (strcmp (opt, "json") == 0) {
                format = &format_json;
                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;
            } 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;
            } else {
                fprintf (stderr, "Invalid value for --format: %s\n", opt);
                return 1;


@@ -1062,7 +1062,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) {
        } 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) {
        } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
                   (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
            if (params.cryptoctx == NULL) {


@@ -1082,7 +1082,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 #endif
            }
            if (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)
 #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;
        } else {
            fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
            return 1;