From 5aea5b2d9b0c87fe81ee566dba830a568398679c Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Wed, 19 Apr 2017 16:14:08 +0300 Subject: Minor change * mail/mail.h: Remove unneeded extern qualifiers. --- mail/mail.h | 445 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 221 insertions(+), 224 deletions(-) diff --git a/mail/mail.h b/mail/mail.h index 38f70177e..4957baa37 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -180,124 +180,121 @@ extern int skip_empty_attachments; extern int multipart_alternative; /* Functions */ -extern int mail_alias (int argc, char **argv); -extern int mail_alt (int argc, char **argv); /* command alternates */ -extern int mail_cd (int argc, char **argv); -extern int mail_copy (int argc, char **argv); -extern int mail_decode (int argc, char **argv); -extern int mail_delete (int argc, char **argv); -extern int mail_discard (int argc, char **argv); -extern int mail_dp (int argc, char **argv); -extern int mail_echo (int argc, char **argv); -extern int mail_edit (int argc, char **argv); -extern int mail_else (int argc, char **argv); -extern int mail_endif (int argc, char **argv); -extern int mail_exit (int argc, char **argv); -extern int mail_file (int argc, char **argv); -extern int mail_folders (int argc, char **argv); -extern int mail_followup (int argc, char **argv); -extern int mail_from (int argc, char **argv); -extern int mail_from0 (msgset_t *mspec, mu_message_t msg, void *data); -extern void mail_compile_headline (char const *str); - -extern int mail_headers (int argc, char **argv); -extern int mail_hold (int argc, char **argv); -extern int mail_help (int argc, char **argv); -extern int mail_if (int argc, char **argv); -extern int mail_inc (int argc, char **argv); -extern int mail_list (int argc, char **argv); -extern int mail_send (int argc, char **argv); /* command mail */ -extern int mail_mbox (int argc, char **argv); -extern int mail_next (int argc, char **argv); -extern int mail_nounfold (int argc, char **argv); -extern int mail_variable (int argc, char **argv); -extern int mail_pipe (int argc, char **argv); -extern int mail_previous (int argc, char **argv); -extern int mail_print (int argc, char **argv); -extern int mail_quit (int argc, char **argv); -extern int mail_reply (int argc, char **argv); -extern int mail_retain (int argc, char **argv); -extern int mail_save (int argc, char **argv); -extern int mail_sendheader (int argc, char **argv); -extern int mail_set (int argc, char **argv); -extern int mail_shell (int argc, char **argv); -extern int mail_execute (int shell, char *progname, int argc, char **argv); -extern int mail_size (int argc, char **argv); -extern int mail_source (int argc, char **argv); -extern int mail_summary (int argc, char **argv); -extern int mail_tag (int argc, char **argv); -extern int mail_top (int argc, char **argv); -extern int mail_touch (int argc, char **argv); -extern int mail_unalias (int argc, char **argv); -extern int mail_undelete (int argc, char **argv); -extern int mail_unfold (int argc, char **argv); -extern int mail_unset (int argc, char **argv); -extern int mail_version (int argc, char **argv); -extern int mail_visual (int argc, char **argv); -extern int mail_warranty (int argc, char **argv); -extern int mail_write (int argc, char **argv); -extern int mail_z (int argc, char **argv); -extern int mail_eq (int argc, char **argv); /* command = */ -extern int mail_setenv (int argc, char **argv); -extern int mail_envelope (int argc, char **argv); -extern int print_envelope (msgset_t *mspec, mu_message_t msg, void *data); -extern int mail_struct (int argc, char **argv); - -extern int if_cond (void); - -extern void mail_mainloop (char *(*input) (void *, int), void *closure, int do_history); -extern int mail_copy0 (int argc, char **argv, int mark); -extern int mail_send0 (compose_env_t *env, int save_to); -extern void free_env_headers (compose_env_t *env); +int mail_alias (int argc, char **argv); +int mail_alt (int argc, char **argv); /* command alternates */ +int mail_cd (int argc, char **argv); +int mail_copy (int argc, char **argv); +int mail_decode (int argc, char **argv); +int mail_delete (int argc, char **argv); +int mail_discard (int argc, char **argv); +int mail_dp (int argc, char **argv); +int mail_echo (int argc, char **argv); +int mail_edit (int argc, char **argv); +int mail_else (int argc, char **argv); +int mail_endif (int argc, char **argv); +int mail_exit (int argc, char **argv); +int mail_file (int argc, char **argv); +int mail_folders (int argc, char **argv); +int mail_followup (int argc, char **argv); +int mail_from (int argc, char **argv); +int mail_from0 (msgset_t *mspec, mu_message_t msg, void *data); +void mail_compile_headline (char const *str); + +int mail_headers (int argc, char **argv); +int mail_hold (int argc, char **argv); +int mail_help (int argc, char **argv); +int mail_if (int argc, char **argv); +int mail_inc (int argc, char **argv); +int mail_list (int argc, char **argv); +int mail_send (int argc, char **argv); /* command mail */ +int mail_mbox (int argc, char **argv); +int mail_next (int argc, char **argv); +int mail_nounfold (int argc, char **argv); +int mail_variable (int argc, char **argv); +int mail_pipe (int argc, char **argv); +int mail_previous (int argc, char **argv); +int mail_print (int argc, char **argv); +int mail_quit (int argc, char **argv); +int mail_reply (int argc, char **argv); +int mail_retain (int argc, char **argv); +int mail_save (int argc, char **argv); +int mail_sendheader (int argc, char **argv); +int mail_set (int argc, char **argv); +int mail_shell (int argc, char **argv); +int mail_execute (int shell, char *progname, int argc, char **argv); +int mail_size (int argc, char **argv); +int mail_source (int argc, char **argv); +int mail_summary (int argc, char **argv); +int mail_tag (int argc, char **argv); +int mail_top (int argc, char **argv); +int mail_touch (int argc, char **argv); +int mail_unalias (int argc, char **argv); +int mail_undelete (int argc, char **argv); +int mail_unfold (int argc, char **argv); +int mail_unset (int argc, char **argv); +int mail_version (int argc, char **argv); +int mail_visual (int argc, char **argv); +int mail_warranty (int argc, char **argv); +int mail_write (int argc, char **argv); +int mail_z (int argc, char **argv); +int mail_eq (int argc, char **argv); /* command = */ +int mail_setenv (int argc, char **argv); +int mail_envelope (int argc, char **argv); +int print_envelope (msgset_t *mspec, mu_message_t msg, void *data); +int mail_struct (int argc, char **argv); + +int if_cond (void); + +void mail_mainloop (char *(*input) (void *, int), void *closure, int do_history); +int mail_copy0 (int argc, char **argv, int mark); +int mail_send0 (compose_env_t *env, int save_to); +void free_env_headers (compose_env_t *env); /*extern void print_message (mu_message_t mesg, char *prefix, int all_headers, FILE *file);*/ -extern int mail_mbox_commit (void); -extern int mail_is_my_name (const char *name); -extern void mail_set_my_name (char *name); -extern char *mail_whoami (void); -extern int mail_header_is_visible (const char *str); -extern int mail_header_is_unfoldable (const char *str); -extern int mail_mbox_close (void); -extern char *mail_expand_name (const char *name); - -extern void send_append_header (char const *text); -extern void send_append_header2 (char const *name, char const *value, int mode); -extern int send_attach_file (int fd, - const char *filename, - const char *content_filename, - const char *content_name, - const char *content_type, const char *encoding); - -extern int escape_check_args (int argc, char **argv, int minargs, int maxargs); - -extern int escape_shell (int argc, char **argv, compose_env_t *env); -extern int escape_command (int argc, char **argv, compose_env_t *env); -extern int escape_help (int argc, char **argv, compose_env_t *env); -extern int escape_sign (int argc, char **argv, compose_env_t *env); -extern int escape_bcc (int argc, char **argv, compose_env_t *env); -extern int escape_cc (int argc, char **argv, compose_env_t *env); -extern int escape_deadletter (int argc, char **argv, compose_env_t *env); -extern int escape_editor (int argc, char **argv, compose_env_t *env); -extern int escape_print (int argc, char **argv, compose_env_t *env); -extern int escape_headers (int argc, char **argv, compose_env_t *env); -extern int escape_insert (int argc, char **argv, compose_env_t *env); -extern int escape_quote (int argc, char **argv, compose_env_t *env); -extern int escape_type_input (int argc, char **argv, compose_env_t *env); -extern int escape_read (int argc, char **argv, compose_env_t *env); -extern int escape_subj (int argc, char **argv, compose_env_t *env); -extern int escape_to (int argc, char **argv, compose_env_t *env); -extern int escape_visual (int argc, char **argv, compose_env_t *env); -extern int escape_write (int argc, char **argv, compose_env_t *env); -extern int escape_exit (int argc, char **argv, compose_env_t *env); -extern int escape_pipe (int argc, char **argv, compose_env_t *env); -extern int escape_list_attachments (int argc, char **argv, - compose_env_t *env); -extern int escape_attach (int argc, char **argv, compose_env_t *env); -extern int escape_remove_attachment (int argc, char **argv, - compose_env_t *env); -extern int escape_toggle_multipart_type (int argc, char **argv, - compose_env_t *env); +int mail_mbox_commit (void); +int mail_is_my_name (const char *name); +void mail_set_my_name (char *name); +char *mail_whoami (void); +int mail_header_is_visible (const char *str); +int mail_header_is_unfoldable (const char *str); +int mail_mbox_close (void); +char *mail_expand_name (const char *name); + +void send_append_header (char const *text); +void send_append_header2 (char const *name, char const *value, int mode); +int send_attach_file (int fd, + const char *filename, + const char *content_filename, + const char *content_name, + const char *content_type, const char *encoding); + +int escape_check_args (int argc, char **argv, int minargs, int maxargs); + +int escape_shell (int argc, char **argv, compose_env_t *env); +int escape_command (int argc, char **argv, compose_env_t *env); +int escape_help (int argc, char **argv, compose_env_t *env); +int escape_sign (int argc, char **argv, compose_env_t *env); +int escape_bcc (int argc, char **argv, compose_env_t *env); +int escape_cc (int argc, char **argv, compose_env_t *env); +int escape_deadletter (int argc, char **argv, compose_env_t *env); +int escape_editor (int argc, char **argv, compose_env_t *env); +int escape_print (int argc, char **argv, compose_env_t *env); +int escape_headers (int argc, char **argv, compose_env_t *env); +int escape_insert (int argc, char **argv, compose_env_t *env); +int escape_quote (int argc, char **argv, compose_env_t *env); +int escape_type_input (int argc, char **argv, compose_env_t *env); +int escape_read (int argc, char **argv, compose_env_t *env); +int escape_subj (int argc, char **argv, compose_env_t *env); +int escape_to (int argc, char **argv, compose_env_t *env); +int escape_visual (int argc, char **argv, compose_env_t *env); +int escape_write (int argc, char **argv, compose_env_t *env); +int escape_exit (int argc, char **argv, compose_env_t *env); +int escape_pipe (int argc, char **argv, compose_env_t *env); +int escape_list_attachments (int argc, char **argv, compose_env_t *env); +int escape_attach (int argc, char **argv, compose_env_t *env); +int escape_remove_attachment (int argc, char **argv, compose_env_t *env); +int escape_toggle_multipart_type (int argc, char **argv, compose_env_t *env); enum { @@ -306,29 +303,28 @@ enum parse_headers_fatal }; -extern int parse_headers (mu_stream_t input, compose_env_t *env); +int parse_headers (mu_stream_t input, compose_env_t *env); /* Cursor */ -extern void set_cursor (unsigned value); -extern size_t get_cursor (void); -extern void page_invalidate (int hard); -extern void cond_page_invalidate (size_t value); -extern void page_do (msg_handler_t func, void *data); -extern size_t page_move (off_t offset); -extern int is_current_message (size_t n); +void set_cursor (unsigned value); +size_t get_cursor (void); +void page_invalidate (int hard); +void cond_page_invalidate (size_t value); +void page_do (msg_handler_t func, void *data); +size_t page_move (off_t offset); +int is_current_message (size_t n); /* msgsets */ -extern void msgset_free (msgset_t *msg_set); -extern msgset_t *msgset_make_1 (size_t number); -extern msgset_t *msgset_append (msgset_t *one, msgset_t *two); -extern msgset_t *msgset_range (int low, int high); -extern msgset_t *msgset_expand (msgset_t *set, msgset_t *expand_by); -extern msgset_t *msgset_dup (const msgset_t *set); -extern int msgset_parse (const int argc, char **argv, - int flags, msgset_t **mset); -extern int msgset_member (msgset_t *set, size_t n); -extern msgset_t *msgset_negate (msgset_t *set); -extern size_t msgset_count (msgset_t *set); +void msgset_free (msgset_t *msg_set); +msgset_t *msgset_make_1 (size_t number); +msgset_t *msgset_append (msgset_t *one, msgset_t *two); +msgset_t *msgset_range (int low, int high); +msgset_t *msgset_expand (msgset_t *set, msgset_t *expand_by); +msgset_t *msgset_dup (const msgset_t *set); +int msgset_parse (const int argc, char **argv, int flags, msgset_t **mset); +int msgset_member (msgset_t *set, size_t n); +msgset_t *msgset_negate (msgset_t *set); +size_t msgset_count (msgset_t *set); #define MDHINT_SELECTED_HEADERS 0x1 @@ -346,79 +342,80 @@ struct mime_descend_closure typedef int (*mime_descend_fn) (struct mime_descend_closure *closure, void *data); -extern int mime_descend (struct mime_descend_closure *closure, - mime_descend_fn fun, void *data); +int mime_descend (struct mime_descend_closure *closure, + mime_descend_fn fun, void *data); -extern int util_do_command (const char *cmd, ...) MU_PRINTFLIKE(1,2); - -extern int util_foreach_msg (int argc, char **argv, int flags, - msg_handler_t func, void *data); -extern size_t util_range_msg (size_t low, size_t high, int flags, - msg_handler_t func, void *data); - -extern function_t* util_command_get (const char *cmd); - -extern void *util_find_entry (void *table, size_t nmemb, size_t size, - const char *cmd); -extern int util_help (void *table, size_t nmemb, size_t size, const char *word); -extern int util_command_list (void *table, size_t nmemb, size_t size); - -extern const struct mail_command_entry *mail_find_command (const char *cmd); -extern const struct mail_escape_entry *mail_find_escape (const char *cmd); -extern int mail_command_help (const char *command); -extern int mail_escape_help (const char *command); -extern void mail_command_list (void); -extern const struct mail_command *mail_command_name (int i); - -extern int util_getcols (void); -extern int util_getlines (void); -extern int util_screen_lines (void); -extern int util_screen_columns (void); -extern int util_get_crt (void); -extern struct mailvar_variable *mailvar_find_variable (const char *var, int create); -extern int mailvar_get (void *ptr, const char *variable, - enum mailvar_type type, int warn); +int util_do_command (const char *cmd, ...) MU_PRINTFLIKE(1,2); + +int util_foreach_msg (int argc, char **argv, int flags, + msg_handler_t func, void *data); +size_t util_range_msg (size_t low, size_t high, int flags, + msg_handler_t func, void *data); + +function_t *util_command_get (const char *cmd); + +void *util_find_entry (void *table, size_t nmemb, size_t size, + const char *cmd); +int util_help (void *table, size_t nmemb, size_t size, const char *word); +int util_command_list (void *table, size_t nmemb, size_t size); + +const struct mail_command_entry *mail_find_command (const char *cmd); +const struct mail_escape_entry *mail_find_escape (const char *cmd); +int mail_command_help (const char *command); +int mail_escape_help (const char *command); +void mail_command_list (void); +const struct mail_command *mail_command_name (int i); + +int util_getcols (void); +int util_getlines (void); +int util_screen_lines (void); +int util_screen_columns (void); +int util_get_crt (void); +struct mailvar_variable *mailvar_find_variable (const char *var, int create); +int mailvar_get (void *ptr, const char *variable, + enum mailvar_type type, int warn); int mailvar_is_true (char const *name); -extern void mailvar_print (int set); -extern void mailvar_variable_format (mu_stream_t, - const struct mailvar_variable *, - const char *defval); +void mailvar_print (int set); +void mailvar_variable_format (mu_stream_t, + const struct mailvar_variable *, + const char *defval); #define MOPTF_OVERWRITE 0x001 #define MOPTF_QUIET 0x002 #define MOPTF_UNSET 0x004 -extern int mailvar_set (const char *name, void *value, - enum mailvar_type type, int flags); -extern int util_isdeleted (size_t msgno); -extern char *util_get_homedir (void); -extern char *util_fullpath (const char *inpath); -extern char *util_folder_path (const char *name); -extern char *util_get_sender (int msgno, int strip); - -extern void util_slist_print (mu_list_t list, int nl); -extern int util_slist_lookup (mu_list_t list, const char *str); -extern void util_slist_add (mu_list_t *list, char *value); -extern void util_slist_remove (mu_list_t *list, char *value); -extern void util_slist_destroy (mu_list_t *list); -extern char *util_slist_to_string (mu_list_t list, const char *delim); -extern void util_strcat (char **dest, const char *str); -extern char *util_outfolder_name (char *str); -extern void util_save_outgoing (mu_message_t msg, char *savefile); -extern int util_error_range (size_t msgno); -extern void util_noapp (void); -extern int util_tempfile (char **namep); -extern void util_msgset_iterate (msgset_t *msgset, - int (*fun) (mu_message_t, msgset_t *, void *), - void *closure); -extern int util_get_content_type (mu_header_t hdr, char **value, char **args); -extern int util_get_hdr_value (mu_header_t hdr, const char *name, char **value); -extern int util_merge_addresses (char **addr_str, const char *value); -extern int util_header_expand (mu_header_t *hdr); -extern int util_get_message (mu_mailbox_t mbox, size_t msgno, mu_message_t *msg); -void util_cache_command (mu_list_t *list, const char *fmt, ...) MU_PRINTFLIKE(2,3); +int mailvar_set (const char *name, void *value, + enum mailvar_type type, int flags); +int util_isdeleted (size_t msgno); +char *util_get_homedir (void); +char *util_fullpath (const char *inpath); +char *util_folder_path (const char *name); +char *util_get_sender (int msgno, int strip); + +void util_slist_print (mu_list_t list, int nl); +int util_slist_lookup (mu_list_t list, const char *str); +void util_slist_add (mu_list_t *list, char *value); +void util_slist_remove (mu_list_t *list, char *value); +void util_slist_destroy (mu_list_t *list); +char *util_slist_to_string (mu_list_t list, const char *delim); +void util_strcat (char **dest, const char *str); +char *util_outfolder_name (char *str); +void util_save_outgoing (mu_message_t msg, char *savefile); +int util_error_range (size_t msgno); +void util_noapp (void); +int util_tempfile (char **namep); +void util_msgset_iterate (msgset_t *msgset, + int (*fun) (mu_message_t, msgset_t *, void *), + void *closure); +int util_get_content_type (mu_header_t hdr, char **value, char **args); +int util_get_hdr_value (mu_header_t hdr, const char *name, char **value); +int util_merge_addresses (char **addr_str, const char *value); +int util_header_expand (mu_header_t *hdr); +int util_get_message (mu_mailbox_t mbox, size_t msgno, mu_message_t *msg); +void util_cache_command (mu_list_t *list, const char *fmt, ...) + MU_PRINTFLIKE(2,3); void util_run_cached_commands (mu_list_t *list); const char *util_reply_prefix (void); void util_rfc2047_decode (char **value); @@ -434,25 +431,25 @@ void format_msgset (mu_stream_t str, const msgset_t *msgset, size_t *count); int is_address_field (const char *name); -extern int ml_got_interrupt (void); -extern void ml_clear_interrupt (void); -extern void ml_readline_init (void); -extern int ml_reread (const char *prompt, char **text); -extern char *ml_readline (const char *prompt); -extern char *ml_readline_with_intr (const char *prompt); +int ml_got_interrupt (void); +void ml_clear_interrupt (void); +void ml_readline_init (void); +int ml_reread (const char *prompt, char **text); +char *ml_readline (const char *prompt); +char *ml_readline_with_intr (const char *prompt); -extern char *alias_expand (const char *name); -extern void alias_destroy (const char *name); +char *alias_expand (const char *name); +void alias_destroy (const char *name); typedef struct alias_iterator *alias_iterator_t; -extern char *alias_find_first (const char *prefix, alias_iterator_t *itr); -extern const char *alias_iterate_next (alias_iterator_t itr); -extern const char *alias_iterate_first (const char *p, alias_iterator_t *itr); -extern void alias_iterate_end (alias_iterator_t *itr); +char *alias_find_first (const char *prefix, alias_iterator_t *itr); +const char *alias_iterate_next (alias_iterator_t itr); +const char *alias_iterate_first (const char *p, alias_iterator_t *itr); +void alias_iterate_end (alias_iterator_t *itr); -extern int mail_sender (int argc, char **argv); -extern int mail_nosender (int argc, char **argv); -extern mu_address_t get_sender_address (mu_message_t msg); +int mail_sender (int argc, char **argv); +int mail_nosender (int argc, char **argv); +mu_address_t get_sender_address (mu_message_t msg); #define COMPOSE_APPEND 0 #define COMPOSE_REPLACE 1 @@ -465,7 +462,7 @@ char *compose_header_get (compose_env_t *env, char *name, char *defval); void compose_destroy (compose_env_t *env); #ifndef HAVE_READLINE_READLINE_H -extern char *readline (char *prompt); +char *readline (char *prompt); #endif /* Flags for util_get_message */ @@ -482,18 +479,18 @@ extern char *readline (char *prompt); #define MAIL_ATTRIBUTE_SHOWN 0x0010 #define MAIL_ATTRIBUTE_TOUCHED 0x0020 -extern void ml_attempted_completion_over (void); +void ml_attempted_completion_over (void); #ifdef WITH_READLINE -extern char **file_compl (int argc, char **argv, int ws); -extern char **no_compl (int argc, char **argv, int ws); -extern char **msglist_compl (int argc, char **argv, int ws); -extern char **msglist_file_compl (int argc, char **argv, int ws); -extern char **dir_compl (int argc, char **argv, int ws); -extern char **command_compl (int argc, char **argv, int ws); -extern char **alias_compl (int argc, char **argv, int ws); -extern char **mailvar_set_compl (int argc, char **argv, int ws); -extern char **exec_compl (int argc, char **argv, int ws); +char **file_compl (int argc, char **argv, int ws); +char **no_compl (int argc, char **argv, int ws); +char **msglist_compl (int argc, char **argv, int ws); +char **msglist_file_compl (int argc, char **argv, int ws); +char **dir_compl (int argc, char **argv, int ws); +char **command_compl (int argc, char **argv, int ws); +char **alias_compl (int argc, char **argv, int ws); +char **mailvar_set_compl (int argc, char **argv, int ws); +char **exec_compl (int argc, char **argv, int ws); #else # define file_compl NULL # define no_compl NULL -- cgit v1.2.1