X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=d1b7801784f40850fe419b8a374b161694236e74;hp=6c84ecc01af6cebb5f9df2325c024933e0c36cba;hb=33382c2b5ba2537952a60ea378feff36961e4713;hpb=045f0e455ac94e2393d0d729c9bbdf3459a4860f diff --git a/notmuch-client.h b/notmuch-client.h index 6c84ecc0..d1b78017 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -53,9 +53,9 @@ #include "talloc-extra.h" #include "crypto.h" -#define unused(x) x __attribute__ ((unused)) +#define unused(x) x ## _unused __attribute__ ((unused)) -#define STRINGIFY(s) STRINGIFY_(s) +#define STRINGIFY(s) STRINGIFY_ (s) #define STRINGIFY_(s) #s typedef struct mime_node mime_node_t; @@ -63,10 +63,10 @@ struct sprinter; struct notmuch_show_params; typedef struct notmuch_show_format { - struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream); - notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter, - struct mime_node *node, int indent, - const struct notmuch_show_params *params); + struct sprinter *(*new_sprinter)(const void *ctx, FILE *stream); + notmuch_status_t (*part)(const void *ctx, struct sprinter *sprinter, + struct mime_node *node, int indent, + const struct notmuch_show_params *params); } notmuch_show_format_t; typedef struct notmuch_show_params { @@ -85,12 +85,12 @@ typedef struct notmuch_show_params { * * Note that __location__ comes from talloc.h. */ -#define INTERNAL_ERROR(format, ...) \ - do { \ - fprintf(stderr, \ - "Internal error: " format " (%s)\n", \ - ##__VA_ARGS__, __location__); \ - exit (1); \ +#define INTERNAL_ERROR(format, ...) \ + do { \ + fprintf (stderr, \ + "Internal error: " format " (%s)\n", \ + ##__VA_ARGS__, __location__); \ + exit (1); \ } while (0) #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) @@ -101,8 +101,8 @@ typedef struct notmuch_show_params { static inline void chomp_newline (char *str) { - if (str && str[strlen(str)-1] == '\n') - str[strlen(str)-1] = '\0'; + if (str && str[strlen (str) - 1] == '\n') + str[strlen (str) - 1] = '\0'; } /* Exit status code indicating temporary failure; user is invited to @@ -232,7 +232,7 @@ format_part_sprinter (const void *ctx, struct sprinter *sp, mime_node_t *node, void format_headers_sprinter (struct sprinter *sp, GMimeMessage *message, - bool reply); + bool reply, const _notmuch_message_crypto_t *msg_crypto); typedef enum { NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0, @@ -251,8 +251,8 @@ json_quote_str (const void *ctx, const char *str); /* notmuch-config.c */ typedef enum { - NOTMUCH_CONFIG_OPEN = 1 << 0, - NOTMUCH_CONFIG_CREATE = 1 << 1, + NOTMUCH_CONFIG_OPEN = 1 << 0, + NOTMUCH_CONFIG_CREATE = 1 << 1, } notmuch_config_mode_t; notmuch_config_t * @@ -276,15 +276,6 @@ void notmuch_config_set_database_path (notmuch_config_t *config, const char *database_path); -#if (GMIME_MAJOR_VERSION < 3) -const char * -notmuch_config_get_crypto_gpg_path (notmuch_config_t *config); - -void -notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, - const char *gpg_path); -#endif - const char * notmuch_config_get_user_name (notmuch_config_t *config); @@ -337,8 +328,8 @@ notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length void notmuch_config_set_search_exclude_tags (notmuch_config_t *config, - const char *list[], - size_t length); + const char *list[], + size_t length); int notmuch_run_hook (const char *db_path, const char *hook); @@ -397,7 +388,7 @@ struct mime_node { /* The list of signatures for signed or encrypted containers. If * there are no signatures, this will be NULL. */ - GMimeSignatureList* sig_list; + GMimeSignatureList *sig_list; /* Internal: Context inherited from the root iterator. */ struct mime_node_context *ctx; @@ -444,10 +435,13 @@ mime_node_t * mime_node_child (mime_node_t *parent, int child); /* Return the nth child of node in a depth-first traversal. If n is - * 0, returns node itself. Returns NULL if there is no such part. */ +* 0, returns node itself. Returns NULL if there is no such part. */ mime_node_t * mime_node_seek_dfs (mime_node_t *node, int n); +const _notmuch_message_crypto_t * +mime_node_get_message_crypto_status (mime_node_t *node); + typedef enum dump_formats { DUMP_FORMAT_AUTO, DUMP_FORMAT_BATCH_TAG, @@ -455,9 +449,9 @@ typedef enum dump_formats { } dump_format_t; typedef enum dump_includes { - DUMP_INCLUDE_TAGS = 1, - DUMP_INCLUDE_CONFIG = 2, - DUMP_INCLUDE_PROPERTIES = 4 + DUMP_INCLUDE_TAGS = 1, + DUMP_INCLUDE_CONFIG = 2, + DUMP_INCLUDE_PROPERTIES = 4 } dump_include_t; #define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES) @@ -473,8 +467,8 @@ notmuch_database_dump (notmuch_database_t *notmuch, bool gzip_output); /* If status is non-zero (i.e. error) print appropriate - messages to stderr. -*/ + * messages to stderr. + */ notmuch_status_t print_status_query (const char *loc, @@ -497,11 +491,11 @@ status_to_exit (notmuch_status_t status); #include "command-line-arguments.h" extern const char *notmuch_requested_db_uuid; -extern const notmuch_opt_desc_t notmuch_shared_options []; +extern const notmuch_opt_desc_t notmuch_shared_options []; void notmuch_exit_if_unmatched_db_uuid (notmuch_database_t *notmuch); -void notmuch_process_shared_options (const char* subcommand_name); -int notmuch_minimal_options (const char* subcommand_name, +void notmuch_process_shared_options (const char *subcommand_name); +int notmuch_minimal_options (const char *subcommand_name, int argc, char **argv); @@ -510,11 +504,11 @@ int notmuch_minimal_options (const char* subcommand_name, struct _notmuch_client_indexing_cli_choices { int decrypt_policy; bool decrypt_policy_set; - notmuch_indexopts_t * opts; + notmuch_indexopts_t *opts; }; extern struct _notmuch_client_indexing_cli_choices indexing_cli_choices; -extern const notmuch_opt_desc_t notmuch_shared_indexing_options []; +extern const notmuch_opt_desc_t notmuch_shared_indexing_options []; notmuch_status_t -notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, notmuch_config_t *config); +notmuch_process_shared_indexing_options (notmuch_database_t *notmuch); #endif