cli: move config open/close to main() from subcommands

[notmuch] / notmuch-client.h

diff --git a/notmuch-client.h b/notmuch-client.h
index b3dcb21a5fa8eeb30b36aa2babaf3d40ad55378f..45749a6b2d6ad5c4c1d278ba10439ba5366cc9c6 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -150,6 +150,8 @@ chomp_newline (char *str)
  */
 extern int notmuch_format_version;
 
  */
 extern int notmuch_format_version;
 

+typedef struct _notmuch_config notmuch_config_t;
+

 /* Commands that support structured output should support the
  * following argument
  *  { NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 }
 /* Commands that support structured output should support the
  * following argument
  *  { NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 }


@@ -169,40 +171,34 @@ int
 notmuch_crypto_cleanup (notmuch_crypto_t *crypto);
 
 int
 notmuch_crypto_cleanup (notmuch_crypto_t *crypto);
 
 int

-notmuch_count_command (void *ctx, int argc, char *argv[]);
-
-int
-notmuch_dump_command (void *ctx, int argc, char *argv[]);
+notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_new_command (void *ctx, int argc, char *argv[]);
+notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_reply_command (void *ctx, int argc, char *argv[]);
+notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_restore_command (void *ctx, int argc, char *argv[]);
+notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_search_command (void *ctx, int argc, char *argv[]);
+notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_setup_command (void *ctx, int argc, char *argv[]);
+notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_show_command (void *ctx, int argc, char *argv[]);
+notmuch_setup_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_tag_command (void *ctx, int argc, char *argv[]);
+notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_search_tags_command (void *ctx, int argc, char *argv[]);
+notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[]);

 
 int
 
 int

-notmuch_cat_command (void *ctx, int argc, char *argv[]);
-
-int
-notmuch_config_command (void *ctx, int argc, char *argv[]);
+notmuch_config_command (notmuch_config_t *config, int argc, char *argv[]);

 
 const char *
 notmuch_time_relative_date (const void *ctx, time_t then);
 
 const char *
 notmuch_time_relative_date (const void *ctx, time_t then);


@@ -243,8 +239,6 @@ json_quote_str (const void *ctx, const char *str);
 
 /* notmuch-config.c */
 
 
 /* notmuch-config.c */
 

-typedef struct _notmuch_config notmuch_config_t;
-

 notmuch_config_t *
 notmuch_config_open (void *ctx,
                     const char *filename,
 notmuch_config_t *
 notmuch_config_open (void *ctx,
                     const char *filename,