From: Federico Kircheis Date: Thu, 4 Jul 2019 15:39:19 +0000 (+0200) Subject: Fix functions declarations/definitions X-Git-Tag: 2019-10-25~149^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f703116ac880e949edc1571ffbc6fa7988080f13;p=neomutt Fix functions declarations/definitions As the function declaration and definition did not match up --- diff --git a/compress.h b/compress.h index cf398a968..4fef14849 100644 --- a/compress.h +++ b/compress.h @@ -48,7 +48,6 @@ struct CompressInfo bool mutt_comp_can_append(struct Mailbox *m); bool mutt_comp_can_read(const char *path); int mutt_comp_valid_command(const char *cmd); -int comp_path_probe(const char *path, const struct stat *st); extern struct MxOps MxCompOps; diff --git a/icommands.h b/icommands.h index 80193d9cd..ed0d06962 100644 --- a/icommands.h +++ b/icommands.h @@ -48,6 +48,6 @@ struct ICommand unsigned long data; ///< Private data to pass to the command }; -int mutt_parse_icommand(/* const */ char *line, struct Buffer *err); +enum CommandResult mutt_parse_icommand(/* const */ char *line, struct Buffer *err); #endif /* MUTT_ICOMMANDS_H */ diff --git a/imap/imap.h b/imap/imap.h index e5bcae418..d5fc6ff3a 100644 --- a/imap/imap.h +++ b/imap/imap.h @@ -90,7 +90,7 @@ int imap_search(struct Mailbox *m, const struct PatternHead *pat); int imap_subscribe(char *path, bool subscribe); int imap_complete(char *buf, size_t buflen, char *path); int imap_fast_trash(struct Mailbox *m, char *dest); -int imap_path_probe(const char *path, const struct stat *st); +enum MailboxType imap_path_probe(const char *path, const struct stat *st); int imap_path_canon(char *buf, size_t buflen); extern struct MxOps MxImapOps; diff --git a/mx.h b/mx.h index 04f4d31e3..acb8de76e 100644 --- a/mx.h +++ b/mx.h @@ -283,7 +283,7 @@ struct Message *mx_msg_open_new (struct Mailbox *m, struct Email *e, MsgOpenF struct Message *mx_msg_open (struct Mailbox *m, int msgno); int mx_msg_padding_size(struct Mailbox *m); int mx_save_hcache (struct Mailbox *m, struct Email *e); -int mx_path_canon (char *buf, size_t buflen, const char *folder, int *magic); +int mx_path_canon (char *buf, size_t buflen, const char *folder, enum MailboxType *magic); int mx_path_canon2 (struct Mailbox *m, const char *folder); int mx_path_parent (char *buf, size_t buflen); int mx_path_pretty (char *buf, size_t buflen, const char *folder); diff --git a/nntp/nntp.h b/nntp/nntp.h index 1cdd969c1..da2189054 100644 --- a/nntp/nntp.h +++ b/nntp/nntp.h @@ -173,7 +173,7 @@ void nntp_expand_path(char *buf, size_t buflen, struct ConnAccount *acct); void nntp_clear_cache(struct NntpAccountData *adata); const char *nntp_format_str(char *buf, size_t buflen, size_t col, int cols, char op, const char *src, const char *prec, const char *if_str, const char *else_str, unsigned long data, MuttFormatFlags flags); int nntp_compare_order(const void *a, const void *b); -int nntp_path_probe(const char *path, const struct stat *st); +enum MailboxType nntp_path_probe(const char *path, const struct stat *st); const char *group_index_format_str(char *buf, size_t buflen, size_t col, int cols, char op, const char *src, const char *prec, const char *if_str, const char *else_str, unsigned long data, MuttFormatFlags flags); int nntp_complete(char *buf, size_t buflen); diff --git a/pop/pop.h b/pop/pop.h index 0b4d8eca0..65b85ba00 100644 --- a/pop/pop.h +++ b/pop/pop.h @@ -56,6 +56,6 @@ extern unsigned char C_PopReconnect; extern struct MxOps MxPopOps; void pop_fetch_mail(void); -int pop_path_probe(const char *path, const struct stat *st); +enum MailboxType pop_path_probe(const char *path, const struct stat *st); #endif /* MUTT_POP_POP_H */