debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 09:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: drop notmuch_config_t from subcommand interface.

Browse source 
At this point it is unused in all subcommands.
This commit is contained in:
David Bremner 2021-02-27 10:07:45 -04:00
parent ec4b7efbe4
commit 1c747a501c
15 changed files with 37 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
notmuch-client.h
View file

@ -171,60 +171,46 @@ void
notmuch_exit_if_unsupported_format (void);
int
notmuch_count_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_count_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_dump_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_dump_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_new_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_new_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_insert_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_reindex_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_reindex_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_reply_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_reply_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_restore_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_restore_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_search_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_search_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_address_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_address_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_setup_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_setup_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_show_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_show_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_tag_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_config_command (notmuch_database_t *notmuch, int argc, char *argv[]);
int
notmuch_compact_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
notmuch_compact_command (notmuch_database_t *notmuch, int argc, char *argv[]);
const char *
notmuch_time_relative_date (const void *ctx, time_t then);

3
notmuch-compact.c
View file

@ -27,8 +27,7 @@ status_update_cb (const char *msg, unused (void *closure))
}
int
notmuch_compact_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_compact_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
const char *backup_path = NULL;
notmuch_status_t ret;

7
notmuch-config.c
View file

@ -578,7 +578,7 @@ _set_db_config (notmuch_database_t *notmuch, const char *key, int argc, char **a
}
static int
notmuch_config_command_set (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
notmuch_config_command_set (notmuch_database_t *notmuch,
int argc, char *argv[])
{
char *group, *key;
@ -691,8 +691,7 @@ notmuch_config_command_list (notmuch_database_t *notmuch)
}
int
notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_config_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
int ret;
int opt_index;
@ -722,7 +721,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
}
ret = notmuch_config_command_get (notmuch, argv[1]);
} else if (strcmp (argv[0], "set") == 0) {
ret = notmuch_config_command_set (config, notmuch, argc, argv);
ret = notmuch_config_command_set (notmuch, argc, argv);
} else if (strcmp (argv[0], "list") == 0) {
ret = notmuch_config_command_list (notmuch);
} else {

3
notmuch-count.c
View file

@ -151,8 +151,7 @@ count_file (notmuch_database_t *notmuch, FILE *input, notmuch_config_values_t *e
}
int
notmuch_count_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_count_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
char *query_str;
int opt_index;

3
notmuch-dump.c
View file

@ -361,8 +361,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
}
int
notmuch_dump_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_dump_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
const char *query_str = NULL;
int ret;

3
notmuch-insert.c
View file

@ -444,8 +444,7 @@ add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
}
int
notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
notmuch_status_t status, close_status;
struct sigaction action;

3
notmuch-new.c
View file

@ -1104,8 +1104,7 @@ _maybe_upgrade (notmuch_database_t *notmuch, add_files_state_t *state)
}
int
notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_new_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
add_files_state_t add_files_state = {
.verbosity = VERBOSITY_NORMAL,

3
notmuch-reindex.c
View file

@ -83,8 +83,7 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string,
}
int
notmuch_reindex_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_reindex_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
char *query_string = NULL;
struct sigaction action;

3
notmuch-reply.c
View file

@ -705,8 +705,7 @@ do_reply (notmuch_database_t *notmuch,
}
int
notmuch_reply_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_reply_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
notmuch_query_t *query;
char *query_string;

3
notmuch-restore.c
View file

@ -219,8 +219,7 @@ parse_sup_line (void *ctx, char *line,
}
int
notmuch_restore_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_restore_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
bool accumulate = false;
tag_op_flag_t flags = 0;

6
notmuch-search.c
View file

@ -794,8 +794,7 @@ static const notmuch_opt_desc_t common_options[] = {
};
int
notmuch_search_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_search_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
search_context_t *ctx = &search_context;
int opt_index, ret;
@ -862,8 +861,7 @@ notmuch_search_command (unused(notmuch_config_t *config), notmuch_database_t *no
}
int
notmuch_address_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_address_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
search_context_t *ctx = &search_context;
int opt_index, ret;

3
notmuch-setup.c
View file

@ -124,8 +124,7 @@ parse_tag_list (void *ctx, char *response)
}
int
notmuch_setup_command (unused(notmuch_config_t *config),
notmuch_database_t *notmuch,
notmuch_setup_command (notmuch_database_t *notmuch,
int argc, char *argv[])
{
char *response = NULL;

3
notmuch-show.c
View file

@ -1225,8 +1225,7 @@ static const notmuch_show_format_t *formatters[] = {
};
int
notmuch_show_command (unused (notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_show_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
notmuch_query_t *query;
char *query_string;

3
notmuch-tag.c
View file

@ -187,8 +187,7 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
}
int
notmuch_tag_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch,
int argc, char *argv[])
notmuch_tag_command (notmuch_database_t *notmuch, int argc, char *argv[])
{
tag_op_list_t *tag_ops = NULL;
char *query_string = NULL;

18
notmuch.c
View file

@ -31,8 +31,7 @@
* Each subcommand should be passed either a config object, or an open
* database
*/
typedef int (*command_function_t) (notmuch_config_t *config, notmuch_database_t *notmuch,
int argc, char *argv[]);
typedef int (*command_function_t) (notmuch_database_t *notmuch, int argc, char *argv[]);
typedef struct command {
const char *name;
@ -42,10 +41,10 @@ typedef struct command {
} command_t;
static int
notmuch_help_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]);
notmuch_help_command (notmuch_database_t *notmuch, int argc, char *argv[]);
static int
notmuch_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]);
notmuch_command (notmuch_database_t *notmuch, int argc, char *argv[]);
static int
_help_for (const char *topic);
@ -349,8 +348,7 @@ _help_for (const char *topic_name)
}
static int
notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database_t *notmuch), int
argc, char *argv[])
notmuch_help_command (unused(notmuch_database_t *notmuch), int argc, char *argv[])
{
int opt_index;
@ -374,8 +372,7 @@ notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database
* to be more clever about this in the future.
*/
static int
notmuch_command (unused(notmuch_config_t *config),
notmuch_database_t *notmuch,
notmuch_command (notmuch_database_t *notmuch,
unused(int argc), unused(char **argv))
{
@ -391,7 +388,7 @@ notmuch_command (unused(notmuch_config_t *config),
strerror (errno));
return EXIT_FAILURE;
} else {
return notmuch_setup_command (NULL, notmuch, 0, NULL);
return notmuch_setup_command (notmuch, 0, NULL);
}
}
@ -457,7 +454,6 @@ main (int argc, char *argv[])
const char *command_name = NULL;
command_t *command;
const char *config_file_name = NULL;
notmuch_config_t *config = NULL;
notmuch_database_t *notmuch = NULL;
int opt_index;
int ret = EXIT_SUCCESS;
@ -589,7 +585,7 @@ main (int argc, char *argv[])
}
ret = (command->function)(config, notmuch, argc - opt_index, argv + opt_index);
ret = (command->function)(notmuch, argc - opt_index, argv + opt_index);
DONE:
talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");