From e29ec5f0e9d36a8ccf335b30554408d4b6cbbc28 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 14 Oct 2017 16:16:07 +0300 Subject: [PATCH] cli: use the negating boolean support for new and insert --no-hooks This lets us use the positive hooks variable in code, increasing clarity. --- notmuch-insert.c | 6 +++--- notmuch-new.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/notmuch-insert.c b/notmuch-insert.c index bb835ba9..48490b51 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -456,7 +456,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) const char *folder = ""; bool create_folder = false; bool keep = false; - bool no_hooks = false; + bool hooks = true; bool synchronize_flags; char *maildir; char *newpath; @@ -467,7 +467,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) { .opt_string = &folder, .name = "folder", .allow_empty = true }, { .opt_bool = &create_folder, .name = "create-folder" }, { .opt_bool = &keep, .name = "keep" }, - { .opt_bool = &no_hooks, .name = "no-hooks" }, + { .opt_bool = &hooks, .name = "hooks" }, { .opt_inherit = notmuch_shared_indexing_options }, { .opt_inherit = notmuch_shared_options }, { } @@ -581,7 +581,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) } } - if (! no_hooks && status == NOTMUCH_STATUS_SUCCESS) { + if (hooks && status == NOTMUCH_STATUS_SUCCESS) { /* Ignore hook failures. */ notmuch_run_hook (db_path, "post-insert"); } diff --git a/notmuch-new.c b/notmuch-new.c index fb021b18..b0a91b0e 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -954,7 +954,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) int opt_index; unsigned int i; bool timer_is_active = false; - bool no_hooks = false; + bool hooks = true; bool quiet = false, verbose = false; notmuch_status_t status; @@ -962,7 +962,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) { .opt_bool = &quiet, .name = "quiet" }, { .opt_bool = &verbose, .name = "verbose" }, { .opt_bool = &add_files_state.debug, .name = "debug" }, - { .opt_bool = &no_hooks, .name = "no-hooks" }, + { .opt_bool = &hooks, .name = "hooks" }, { .opt_inherit = notmuch_shared_indexing_options }, { .opt_inherit = notmuch_shared_options }, { } @@ -996,7 +996,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) } } - if (!no_hooks) { + if (hooks) { ret = notmuch_run_hook (db_path, "pre-new"); if (ret) return EXIT_FAILURE; @@ -1168,7 +1168,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_database_destroy (notmuch); - if (!no_hooks && !ret && !interrupted) + if (hooks && !ret && !interrupted) ret = notmuch_run_hook (db_path, "post-new"); if (ret || interrupted) -- 2.45.2