From: Richard Russon Date: Tue, 4 Sep 2018 20:55:53 +0000 (+0100) Subject: tweak #include guards X-Git-Tag: 2019-10-25~661^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52283b344e13860421f3db0f7aaf5e80f6a4c555;p=neomutt tweak #include guards Closes #1328 --- diff --git a/addrbook.h b/addrbook.h index b58e24d4f..caee59236 100644 --- a/addrbook.h +++ b/addrbook.h @@ -34,4 +34,3 @@ extern short SortAlias; void mutt_alias_menu(char *buf, size_t buflen, struct AliasList *aliases); #endif /* MUTT_ADDRBOOK_H */ - diff --git a/alias.h b/alias.h index 3d544a29d..1214ffde9 100644 --- a/alias.h +++ b/alias.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_ALIAS_H -#define _MUTT_ALIAS_H +#ifndef MUTT_ALIAS_H +#define MUTT_ALIAS_H #include #include @@ -59,4 +59,4 @@ void mutt_alias_add_reverse(struct Alias *t); void mutt_alias_delete_reverse(struct Alias *t); struct Address *mutt_alias_reverse_lookup(struct Address *a); -#endif /* _MUTT_ALIAS_H */ +#endif /* MUTT_ALIAS_H */ diff --git a/bcache.h b/bcache.h index a716a063e..285a5f19c 100644 --- a/bcache.h +++ b/bcache.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_BCACHE_H -#define _MUTT_BCACHE_H +#ifndef MUTT_BCACHE_H +#define MUTT_BCACHE_H #include @@ -53,4 +53,4 @@ int mutt_bcache_list(struct BodyCache *bcache, bcache_list_t *want struct BodyCache *mutt_bcache_open(struct Account *account, const char *mailbox); FILE * mutt_bcache_put(struct BodyCache *bcache, const char *id); -#endif /* _MUTT_BCACHE_H */ +#endif /* MUTT_BCACHE_H */ diff --git a/browser.h b/browser.h index 6e0ddaf79..e6fe779fe 100644 --- a/browser.h +++ b/browser.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_BROWSER_H -#define _MUTT_BROWSER_H +#ifndef MUTT_BROWSER_H +#define MUTT_BROWSER_H #include #include @@ -96,4 +96,4 @@ struct BrowserState void mutt_select_file(char *file, size_t filelen, int flags, char ***files, int *numfiles); void mutt_browser_select_dir(char *f); -#endif /* _MUTT_BROWSER_H */ +#endif /* MUTT_BROWSER_H */ diff --git a/color.h b/color.h index a42df44a2..2fae66e47 100644 --- a/color.h +++ b/color.h @@ -36,4 +36,3 @@ int mutt_parse_uncolor(struct Buffer *buf, struct Buffer *s, unsigned long data int mutt_parse_unmono(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err); #endif /* MUTT_COLOR_H */ - diff --git a/compose.h b/compose.h index edda97f9e..af96dc3e5 100644 --- a/compose.h +++ b/compose.h @@ -38,4 +38,3 @@ extern unsigned char Postpone; int mutt_compose_menu(struct Header *msg, char *fcc, size_t fcclen, struct Header *cur, int flags); #endif /* MUTT_COMPOSE_H */ - diff --git a/compress.h b/compress.h index 52be19f8c..27adeb6fe 100644 --- a/compress.h +++ b/compress.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_COMPRESS_H -#define _MUTT_COMPRESS_H +#ifndef MUTT_COMPRESS_H +#define MUTT_COMPRESS_H #include #include "mx.h" @@ -36,4 +36,4 @@ int comp_path_probe(const char *path, const struct stat *st); extern struct MxOps mx_comp_ops; -#endif /* _MUTT_COMPRESS_H */ +#endif /* MUTT_COMPRESS_H */ diff --git a/config/address.h b/config/address.h index bbfbc64f3..1d701fc39 100644 --- a/config/address.h +++ b/config/address.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_ADDRESS_H -#define _CONFIG_ADDRESS_H +#ifndef MUTT_CONFIG_ADDRESS_H +#define MUTT_CONFIG_ADDRESS_H #include @@ -31,4 +31,4 @@ void address_init(struct ConfigSet *cs); struct Address *address_create(const char *addr); void address_free(struct Address **addr); -#endif /* _CONFIG_ADDRESS_H */ +#endif /* MUTT_CONFIG_ADDRESS_H */ diff --git a/config/bool.h b/config/bool.h index acb937ec0..75f7c4d2e 100644 --- a/config/bool.h +++ b/config/bool.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_BOOL_H -#define _CONFIG_BOOL_H +#ifndef MUTT_CONFIG_BOOL_H +#define MUTT_CONFIG_BOOL_H struct Buffer; struct ConfigSet; @@ -33,4 +33,4 @@ void bool_init(struct ConfigSet *cs); int bool_he_toggle(struct ConfigSet *cs, struct HashElem *he, struct Buffer *err); int bool_str_toggle(struct ConfigSet *cs, const char *name, struct Buffer *err); -#endif /* _CONFIG_BOOL_H */ +#endif /* MUTT_CONFIG_BOOL_H */ diff --git a/config/command.h b/config/command.h index fae068a6b..c710bf94b 100644 --- a/config/command.h +++ b/config/command.h @@ -20,11 +20,11 @@ * this program. If not, see . */ -#ifndef _CONFIG_COMMAND_H -#define _CONFIG_COMMAND_H +#ifndef MUTT_CONFIG_COMMAND_H +#define MUTT_CONFIG_COMMAND_H struct ConfigSet; void command_init(struct ConfigSet *cs); -#endif /* _CONFIG_COMMAND_H */ +#endif /* MUTT_CONFIG_COMMAND_H */ diff --git a/config/dump.h b/config/dump.h index cc0e76048..26ddc7ec5 100644 --- a/config/dump.h +++ b/config/dump.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_DUMP_H -#define _CONFIG_DUMP_H +#ifndef MUTT_CONFIG_DUMP_H +#define MUTT_CONFIG_DUMP_H #include @@ -47,4 +47,4 @@ size_t escape_string(struct Buffer *buf, const char *src); struct HashElem **get_elem_list(struct ConfigSet *cs); size_t pretty_var(const char *str, struct Buffer *buf); -#endif /* _CONFIG_DUMP_H */ +#endif /* MUTT_CONFIG_DUMP_H */ diff --git a/config/inheritance.h b/config/inheritance.h index 0199556fa..02ccf89e9 100644 --- a/config/inheritance.h +++ b/config/inheritance.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_INHERITANCE_H -#define _CONFIG_INHERITANCE_H +#ifndef MUTT_CONFIG_INHERITANCE_H +#define MUTT_CONFIG_INHERITANCE_H #include @@ -36,4 +36,4 @@ struct Inheritance intptr_t var; /**< (Pointer to) value, of config item */ }; -#endif /* _CONFIG_INHERITANCE_H */ +#endif /* MUTT_CONFIG_INHERITANCE_H */ diff --git a/config/lib.h b/config/lib.h index e30b8deb5..77e7a4b5d 100644 --- a/config/lib.h +++ b/config/lib.h @@ -43,8 +43,8 @@ * | config/string.c | @subpage config-string | */ -#ifndef _CONFIG_CONFIG_H -#define _CONFIG_CONFIG_H +#ifndef MUTT_CONFIG_LIB_H +#define MUTT_CONFIG_LIB_H #include "address.h" #include "bool.h" @@ -63,4 +63,4 @@ #include "string3.h" #include "types.h" -#endif /* _CONFIG_CONFIG_H */ +#endif /* MUTT_CONFIG_LIB_H */ diff --git a/config/long.h b/config/long.h index 95ab884c8..21addb027 100644 --- a/config/long.h +++ b/config/long.h @@ -20,11 +20,11 @@ * this program. If not, see . */ -#ifndef _CONFIG_LONG_H -#define _CONFIG_LONG_H +#ifndef MUTT_CONFIG_LONG_H +#define MUTT_CONFIG_LONG_H struct ConfigSet; void long_init(struct ConfigSet *cs); -#endif /* _CONFIG_LONG_H */ +#endif /* MUTT_CONFIG_LONG_H */ diff --git a/config/magic.h b/config/magic.h index 7d1459b75..87fcc59a0 100644 --- a/config/magic.h +++ b/config/magic.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_MAGIC_H -#define _CONFIG_MAGIC_H +#ifndef MUTT_CONFIG_MAGIC_H +#define MUTT_CONFIG_MAGIC_H struct ConfigSet; @@ -47,4 +47,4 @@ enum MailboxType void magic_init(struct ConfigSet *cs); -#endif /* _CONFIG_MAGIC_H */ +#endif /* MUTT_CONFIG_MAGIC_H */ diff --git a/config/mbtable.h b/config/mbtable.h index 8af58778c..eb3139f24 100644 --- a/config/mbtable.h +++ b/config/mbtable.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_MBTABLE_H -#define _CONFIG_MBTABLE_H +#ifndef MUTT_CONFIG_MBTABLE_H +#define MUTT_CONFIG_MBTABLE_H struct ConfigSet; @@ -44,4 +44,4 @@ void mbtable_init(struct ConfigSet *cs); struct MbTable *mbtable_parse(const char *str); void mbtable_free(struct MbTable **table); -#endif /* _CONFIG_MBTABLE_H */ +#endif /* MUTT_CONFIG_MBTABLE_H */ diff --git a/config/number.h b/config/number.h index 9e5378a5b..c33e30dad 100644 --- a/config/number.h +++ b/config/number.h @@ -20,11 +20,11 @@ * this program. If not, see . */ -#ifndef _CONFIG_NUMBER_H -#define _CONFIG_NUMBER_H +#ifndef MUTT_CONFIG_NUMBER_H +#define MUTT_CONFIG_NUMBER_H struct ConfigSet; void number_init(struct ConfigSet *cs); -#endif /* _CONFIG_NUMBER_H */ +#endif /* MUTT_CONFIG_NUMBER_H */ diff --git a/config/path.h b/config/path.h index a82ddffe1..254488b21 100644 --- a/config/path.h +++ b/config/path.h @@ -20,11 +20,11 @@ * this program. If not, see . */ -#ifndef _CONFIG_PATH_H -#define _CONFIG_PATH_H +#ifndef MUTT_CONFIG_PATH_H +#define MUTT_CONFIG_PATH_H struct ConfigSet; void path_init(struct ConfigSet *cs); -#endif /* _CONFIG_PATH_H */ +#endif /* MUTT_CONFIG_PATH_H */ diff --git a/config/quad.h b/config/quad.h index 61c437482..44836af2b 100644 --- a/config/quad.h +++ b/config/quad.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_QUAD_H -#define _CONFIG_QUAD_H +#ifndef MUTT_CONFIG_QUAD_H +#define MUTT_CONFIG_QUAD_H struct Buffer; struct ConfigSet; @@ -44,4 +44,4 @@ enum QuadOption void quad_init(struct ConfigSet *cs); int quad_he_toggle(struct ConfigSet *cs, struct HashElem *he, struct Buffer *err); -#endif /* _CONFIG_QUAD_H */ +#endif /* MUTT_CONFIG_QUAD_H */ diff --git a/config/regex2.h b/config/regex2.h index 4cc22afa4..7aac8f936 100644 --- a/config/regex2.h +++ b/config/regex2.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_REGEX_H -#define _CONFIG_REGEX_H +#ifndef MUTT_CONFIG_REGEX_H +#define MUTT_CONFIG_REGEX_H #include #include @@ -33,4 +33,4 @@ void regex_init(struct ConfigSet *cs); struct Regex *regex_create(const char *str, int flags, struct Buffer *err); void regex_free(struct Regex **regex); -#endif /* _CONFIG_REGEX_H */ +#endif /* MUTT_CONFIG_REGEX_H */ diff --git a/config/set.h b/config/set.h index 8deca05bf..cba6c5697 100644 --- a/config/set.h +++ b/config/set.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_SET_H -#define _CONFIG_SET_H +#ifndef MUTT_CONFIG_SET_H +#define MUTT_CONFIG_SET_H #include #include @@ -229,4 +229,4 @@ int cs_str_reset (const struct ConfigSet *cs, const char *name, int cs_str_string_get (const struct ConfigSet *cs, const char *name, struct Buffer *result); int cs_str_string_set (const struct ConfigSet *cs, const char *name, const char *value, struct Buffer *err); -#endif /* _CONFIG_SET_H */ +#endif /* MUTT_CONFIG_SET_H */ diff --git a/config/sort.h b/config/sort.h index b04024d9c..33cba9433 100644 --- a/config/sort.h +++ b/config/sort.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_SORT_H -#define _CONFIG_SORT_H +#ifndef MUTT_CONFIG_SORT_H +#define MUTT_CONFIG_SORT_H #include "mutt/mapping.h" @@ -80,4 +80,4 @@ extern const struct Mapping SortSidebarMethods[]; void sort_init(struct ConfigSet *cs); -#endif /* _CONFIG_SORT_H */ +#endif /* MUTT_CONFIG_SORT_H */ diff --git a/config/string3.h b/config/string3.h index ab24f49ca..0b0d73307 100644 --- a/config/string3.h +++ b/config/string3.h @@ -20,11 +20,11 @@ * this program. If not, see . */ -#ifndef _CONFIG_STRING_H -#define _CONFIG_STRING_H +#ifndef MUTT_CONFIG_STRING_H +#define MUTT_CONFIG_STRING_H struct ConfigSet; void string_init(struct ConfigSet *cs); -#endif /* _CONFIG_STRING_H */ +#endif /* MUTT_CONFIG_STRING_H */ diff --git a/config/types.h b/config/types.h index 1f2814ab2..8648dd846 100644 --- a/config/types.h +++ b/config/types.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONFIG_TYPES_H -#define _CONFIG_TYPES_H +#ifndef MUTT_CONFIG_TYPES_H +#define MUTT_CONFIG_TYPES_H /* Data Types */ #define DT_ADDRESS 1 /**< e-mail address */ @@ -73,4 +73,4 @@ #define F_SENSITIVE (1 << 10) /**< Config item contains sensitive value */ #define IS_SENSITIVE(x) (((x).flags & F_SENSITIVE) == F_SENSITIVE) -#endif /* _CONFIG_TYPES_H */ +#endif /* MUTT_CONFIG_TYPES_H */ diff --git a/conn/account.h b/conn/account.h index 0c0ff4392..d3b07f966 100644 --- a/conn/account.h +++ b/conn/account.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONN_ACCOUNT_H -#define _CONN_ACCOUNT_H +#ifndef MUTT_CONN_ACCOUNT_H +#define MUTT_CONN_ACCOUNT_H /** * struct Account - Login details for a remote server @@ -37,4 +37,4 @@ struct Account unsigned char flags; }; -#endif /* _CONN_ACCOUNT_H */ +#endif /* MUTT_CONN_ACCOUNT_H */ diff --git a/conn/conn.h b/conn/conn.h index f63873bb7..974991372 100644 --- a/conn/conn.h +++ b/conn/conn.h @@ -38,8 +38,8 @@ * | conn/tunnel.c | @subpage conn_tunnel | */ -#ifndef _CONN_CONN_H -#define _CONN_CONN_H +#ifndef MUTT_CONN_CONN_H +#define MUTT_CONN_CONN_H #include @@ -56,4 +56,4 @@ int getdnsdomainname(char *buf, size_t buflen); -#endif /* _CONN_CONN_H */ +#endif /* MUTT_CONN_CONN_H */ diff --git a/conn/conn_globals.h b/conn/conn_globals.h index 4bd9a53a2..4b2996a97 100644 --- a/conn/conn_globals.h +++ b/conn/conn_globals.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONN_GLOBALS_H -#define _CONN_GLOBALS_H +#ifndef MUTT_CONN_CONN_GLOBALS_H +#define MUTT_CONN_CONN_GLOBALS_H #include @@ -58,4 +58,4 @@ extern bool SslVerifyDates; extern bool SslVerifyHost; #endif -#endif /* _CONN_GLOBALS_H */ +#endif /* MUTT_CONN_CONN_GLOBALS_H */ diff --git a/conn/connection.h b/conn/connection.h index 1f4f7d2a2..a8e0a6536 100644 --- a/conn/connection.h +++ b/conn/connection.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _CONN_CONNECTION_H -#define _CONN_CONNECTION_H +#ifndef MUTT_CONN_CONNECTION_H +#define MUTT_CONN_CONNECTION_H #include #include @@ -56,4 +56,4 @@ struct Connection int (*conn_poll)(struct Connection *conn, time_t wait_secs); }; -#endif /* _CONN_CONNECTION_H */ +#endif /* MUTT_CONN_CONNECTION_H */ diff --git a/conn/sasl.h b/conn/sasl.h index 19e593675..a75f1c9c3 100644 --- a/conn/sasl.h +++ b/conn/sasl.h @@ -22,8 +22,8 @@ /* common SASL helper routines */ -#ifndef _CONN_SASL_H -#define _CONN_SASL_H +#ifndef MUTT_CONN_SASL_H +#define MUTT_CONN_SASL_H #include #include @@ -59,4 +59,4 @@ struct SaslData int (*msasl_poll)(struct Connection *conn, time_t wait_secs); }; -#endif /* _CONN_SASL_H */ +#endif /* MUTT_CONN_SASL_H */ diff --git a/conn/sasl_plain.h b/conn/sasl_plain.h index 759745842..41fbcf3f8 100644 --- a/conn/sasl_plain.h +++ b/conn/sasl_plain.h @@ -20,12 +20,12 @@ * this program. If not, see . */ -#ifndef _CONN_SASL_PLAIN_H -#define _CONN_SASL_PLAIN_H +#ifndef MUTT_CONN_SASL_PLAIN_H +#define MUTT_CONN_SASL_PLAIN_H #include size_t mutt_sasl_plain_msg(char *buf, size_t buflen, const char *cmd, const char *authz, const char *user, const char *pass); -#endif /* _CONN_SASL_PLAIN_H */ +#endif /* MUTT_CONN_SASL_PLAIN_H */ diff --git a/conn/socket.h b/conn/socket.h index 48870c15e..a8ad888d8 100644 --- a/conn/socket.h +++ b/conn/socket.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _CONN_SOCKET_H -#define _CONN_SOCKET_H +#ifndef MUTT_CONN_SOCKET_H +#define MUTT_CONN_SOCKET_H #include #include @@ -67,4 +67,4 @@ int raw_socket_open(struct Connection *conn); int raw_socket_close(struct Connection *conn); int raw_socket_poll(struct Connection *conn, time_t wait_secs); -#endif /* _CONN_SOCKET_H */ +#endif /* MUTT_CONN_SOCKET_H */ diff --git a/conn/ssl.h b/conn/ssl.h index 11773ec23..a2002f078 100644 --- a/conn/ssl.h +++ b/conn/ssl.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _CONN_SSL_H -#define _CONN_SSL_H +#ifndef MUTT_CONN_SSL_H +#define MUTT_CONN_SSL_H struct Connection; @@ -40,4 +40,4 @@ static inline int mutt_ssl_socket_setup(struct Connection *conn) } #endif -#endif /* _CONN_SSL_H */ +#endif /* MUTT_CONN_SSL_H */ diff --git a/conn/tunnel.h b/conn/tunnel.h index 0332f6f0b..f3bee368e 100644 --- a/conn/tunnel.h +++ b/conn/tunnel.h @@ -18,11 +18,11 @@ * this program. If not, see . */ -#ifndef _CONN_TUNNEL_H -#define _CONN_TUNNEL_H +#ifndef MUTT_CONN_TUNNEL_H +#define MUTT_CONN_TUNNEL_H struct Connection; void mutt_tunnel_socket_setup(struct Connection *conn); -#endif /* _CONN_TUNNEL_H */ +#endif /* MUTT_CONN_TUNNEL_H */ diff --git a/context.h b/context.h index 8dda5f255..20ed4ff11 100644 --- a/context.h +++ b/context.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_CONTEXT_H -#define _MUTT_CONTEXT_H +#ifndef MUTT_CONTEXT_H +#define MUTT_CONTEXT_H #include #include @@ -100,4 +100,4 @@ struct Context struct Mailbox *mailbox; }; -#endif /* _MUTT_CONTEXT_H */ +#endif /* MUTT_CONTEXT_H */ diff --git a/copy.h b/copy.h index 4a57ba883..4f52bab82 100644 --- a/copy.h +++ b/copy.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_COPY_H -#define _MUTT_COPY_H +#ifndef MUTT_COPY_H +#define MUTT_COPY_H #include @@ -76,4 +76,4 @@ int mutt_copy_message_ctx(FILE *fpout, struct Context *src, struct Header *hdr, int mutt_append_message(struct Context *dest, struct Context *src, struct Header *hdr, int cmflags, int chflags); -#endif /* _MUTT_COPY_H */ +#endif /* MUTT_COPY_H */ diff --git a/email/address.h b/email/address.h index a3033eaba..baf568bcc 100644 --- a/email/address.h +++ b/email/address.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_ADDRESS_H -#define _EMAIL_ADDRESS_H +#ifndef MUTT_EMAIL_ADDRESS_H +#define MUTT_EMAIL_ADDRESS_H #include #include @@ -84,4 +84,4 @@ void mutt_addr_write_single(char *buf, size_t buflen, struct Address int mutt_addrlist_to_intl(struct Address *a, char **err); int mutt_addrlist_to_local(struct Address *a); -#endif /* _EMAIL_ADDRESS_H */ +#endif /* MUTT_EMAIL_ADDRESS_H */ diff --git a/email/attach.h b/email/attach.h index 166bc52b2..2e2e99c36 100644 --- a/email/attach.h +++ b/email/attach.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_ATTACH_H -#define _EMAIL_ATTACH_H +#ifndef MUTT_EMAIL_ATTACH_H +#define MUTT_EMAIL_ATTACH_H #include #include @@ -73,4 +73,4 @@ void mutt_actx_add_fp(struct AttachCtx *actx, FILE *new_fp); void mutt_actx_free(struct AttachCtx **pactx); void mutt_actx_free_entries(struct AttachCtx *actx); -#endif /* _EMAIL_ATTACH_H */ +#endif /* MUTT_EMAIL_ATTACH_H */ diff --git a/email/body.h b/email/body.h index 306424f8a..9bfb7f2d0 100644 --- a/email/body.h +++ b/email/body.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_BODY_H -#define _EMAIL_BODY_H +#ifndef MUTT_EMAIL_BODY_H +#define MUTT_EMAIL_BODY_H #include #include @@ -100,4 +100,4 @@ bool mutt_body_cmp_strict(const struct Body *b1, const struct Body *b2); void mutt_body_free(struct Body **p); struct Body *mutt_body_new(void); -#endif /* _EMAIL_BODY_H */ +#endif /* MUTT_EMAIL_BODY_H */ diff --git a/email/content.h b/email/content.h index 2a2501f3d..461755e98 100644 --- a/email/content.h +++ b/email/content.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_CONTENT_H -#define _EMAIL_CONTENT_H +#ifndef MUTT_EMAIL_CONTENT_H +#define MUTT_EMAIL_CONTENT_H #include @@ -45,4 +45,4 @@ struct Content bool cr : 1; /**< has CR, even when in a CRLF pair */ }; -#endif /* _EMAIL_CONTENT_H */ +#endif /* MUTT_EMAIL_CONTENT_H */ diff --git a/email/email.h b/email/email.h index 0c70db626..740953ee8 100644 --- a/email/email.h +++ b/email/email.h @@ -45,8 +45,8 @@ * | email/url.c | @subpage email_url | */ -#ifndef _EMAIL_EMAIL_H -#define _EMAIL_EMAIL_H +#ifndef MUTT_EMAIL_EMAIL_H +#define MUTT_EMAIL_EMAIL_H #include "address.h" #include "attach.h" @@ -66,4 +66,4 @@ #include "thread.h" #include "url.h" -#endif /* _EMAIL_EMAIL_H */ +#endif /* MUTT_EMAIL_EMAIL_H */ diff --git a/email/email_globals.h b/email/email_globals.h index 3b2fc5e0e..0a8fbc97b 100644 --- a/email/email_globals.h +++ b/email/email_globals.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_GLOBALS_H -#define _EMAIL_GLOBALS_H +#ifndef MUTT_EMAIL_EMAIL_GLOBALS_H +#define MUTT_EMAIL_EMAIL_GLOBALS_H #include #include "mutt/mutt.h" @@ -39,4 +39,4 @@ extern struct RegexList NoSpamList; extern struct ReplaceList SpamList; extern struct ListHead UnIgnore; -#endif /* _EMAIL_GLOBALS_H */ +#endif /* MUTT_EMAIL_EMAIL_GLOBALS_H */ diff --git a/email/envelope.h b/email/envelope.h index 2940f5d49..c0f2e6353 100644 --- a/email/envelope.h +++ b/email/envelope.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_ENVELOPE_H -#define _EMAIL_ENVELOPE_H +#ifndef MUTT_EMAIL_ENVELOPE_H +#define MUTT_EMAIL_ENVELOPE_H #include #include "mutt/mutt.h" @@ -71,4 +71,4 @@ struct Envelope *mutt_env_new(void); int mutt_env_to_intl(struct Envelope *env, const char **tag, char **err); void mutt_env_to_local(struct Envelope *e); -#endif /* _EMAIL_ENVELOPE_H */ +#endif /* MUTT_EMAIL_ENVELOPE_H */ diff --git a/email/from.h b/email/from.h index adc4b9b1f..423c41b28 100644 --- a/email/from.h +++ b/email/from.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_FROM_H -#define _EMAIL_FROM_H +#ifndef MUTT_EMAIL_FROM_H +#define MUTT_EMAIL_FROM_H #include #include @@ -29,4 +29,4 @@ bool is_from(const char *s, char *path, size_t pathlen, time_t *tp); -#endif /* _EMAIL_FROM_H */ +#endif /* MUTT_EMAIL_FROM_H */ diff --git a/email/header.h b/email/header.h index 948ca859a..5b9913f66 100644 --- a/email/header.h +++ b/email/header.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_HEADER_H -#define _EMAIL_HEADER_H +#ifndef MUTT_EMAIL_HEADER_H +#define MUTT_EMAIL_HEADER_H #include #include @@ -118,4 +118,4 @@ bool mutt_header_cmp_strict(const struct Header *h1, const struct Head void mutt_header_free(struct Header **h); struct Header *mutt_header_new(void); -#endif /* _EMAIL_HEADER_H */ +#endif /* MUTT_EMAIL_HEADER_H */ diff --git a/email/idna2.h b/email/idna2.h index e615d4d03..aacdb1197 100644 --- a/email/idna2.h +++ b/email/idna2.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_IDNA_H -#define _EMAIL_IDNA_H +#ifndef MUTT_EMAIL_IDNA_H +#define MUTT_EMAIL_IDNA_H #include @@ -36,4 +36,4 @@ char * mutt_idna_local_to_intl(const char *user, const char *domain); const char *mutt_idna_print_version(void); int mutt_idna_to_ascii_lz(const char *input, char **output, int flags); -#endif /* _EMAIL_IDNA_H */ +#endif /* MUTT_EMAIL_IDNA_H */ diff --git a/email/mime.h b/email/mime.h index 2047841e9..052a61ff2 100644 --- a/email/mime.h +++ b/email/mime.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_MIME_H -#define _EMAIL_MIME_H +#ifndef MUTT_EMAIL_MIME_H +#define MUTT_EMAIL_MIME_H /** * enum ContentType - Content-Type @@ -83,4 +83,4 @@ extern const char MimeSpecials[]; ((X->type == TYPE_OTHER) && X->xtype ? X->xtype : BodyTypes[(X->type)]) #define ENCODING(X) BodyEncodings[(X)] -#endif /* _EMAIL_MIME_H */ +#endif /* MUTT_EMAIL_MIME_H */ diff --git a/email/parameter.h b/email/parameter.h index 52ae6a19e..f1b67ee7c 100644 --- a/email/parameter.h +++ b/email/parameter.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_PARAMETER_H -#define _EMAIL_PARAMETER_H +#ifndef MUTT_EMAIL_PARAMETER_H +#define MUTT_EMAIL_PARAMETER_H #include #include "mutt/mutt.h" @@ -49,4 +49,4 @@ char * mutt_param_get(const struct ParameterList *p, const char *s); struct Parameter *mutt_param_new(void); void mutt_param_set(struct ParameterList *p, const char *attribute, const char *value); -#endif /* _EMAIL_PARAMETER_H */ +#endif /* MUTT_EMAIL_PARAMETER_H */ diff --git a/email/parse.h b/email/parse.h index b027ef468..d317600a2 100644 --- a/email/parse.h +++ b/email/parse.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_PARSE_H -#define _EMAIL_PARSE_H +#ifndef MUTT_EMAIL_PARSE_H +#define MUTT_EMAIL_PARSE_H #include #include @@ -44,4 +44,4 @@ struct Body * mutt_rfc822_parse_message(FILE *fp, struct Body *parent); struct Envelope *mutt_rfc822_read_header(FILE *f, struct Header *hdr, bool user_hdrs, bool weed); char * mutt_rfc822_read_line(FILE *f, char *line, size_t *linelen); -#endif /* _EMAIL_PARSE_H */ +#endif /* MUTT_EMAIL_PARSE_H */ diff --git a/email/rfc2047.h b/email/rfc2047.h index 31fedbf77..873aff2dc 100644 --- a/email/rfc2047.h +++ b/email/rfc2047.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_RFC2047_H -#define _EMAIL_RFC2047_H +#ifndef MUTT_EMAIL_RFC2047_H +#define MUTT_EMAIL_RFC2047_H struct Address; @@ -33,4 +33,4 @@ void rfc2047_encode(char **pd, const char *specials, int col, const char *charse void rfc2047_decode_addrlist(struct Address *a); void rfc2047_encode_addrlist(struct Address *addr, const char *tag); -#endif /* _EMAIL_RFC2047_H */ +#endif /* MUTT_EMAIL_RFC2047_H */ diff --git a/email/rfc2231.h b/email/rfc2231.h index 3a0ad12b3..7d42841c3 100644 --- a/email/rfc2231.h +++ b/email/rfc2231.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_RFC2231_H -#define _EMAIL_RFC2231_H +#ifndef MUTT_EMAIL_RFC2231_H +#define MUTT_EMAIL_RFC2231_H #include @@ -33,4 +33,4 @@ extern bool Rfc2047Parameters; void rfc2231_decode_parameters(struct ParameterList *p); int rfc2231_encode_string(char **pd); -#endif /* _EMAIL_RFC2231_H */ +#endif /* MUTT_EMAIL_RFC2231_H */ diff --git a/email/tags.h b/email/tags.h index 5b11cf312..25a144e4e 100644 --- a/email/tags.h +++ b/email/tags.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_TAG_H -#define _EMAIL_TAG_H +#ifndef MUTT_EMAIL_TAGS_H +#define MUTT_EMAIL_TAGS_H #include #include "mutt/mutt.h" @@ -53,4 +53,4 @@ char *driver_tags_get_transformed_for(char *name, struct TagHead *head); char *driver_tags_get_with_hidden(struct TagHead *head); bool driver_tags_replace(struct TagHead *head, char *tags); -#endif /* _EMAIL_TAG_H */ +#endif /* MUTT_EMAIL_TAGS_H */ diff --git a/email/thread.h b/email/thread.h index bfb07ff13..5fa783151 100644 --- a/email/thread.h +++ b/email/thread.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_THREAD_H -#define _EMAIL_THREAD_H +#ifndef MUTT_EMAIL_THREAD_H +#define MUTT_EMAIL_THREAD_H #include #include @@ -57,4 +57,4 @@ void mutt_break_thread(struct Header *hdr); void thread_hash_destructor(int type, void *obj, intptr_t data); void unlink_message(struct MuttThread **old, struct MuttThread *cur); -#endif /* _EMAIL_THREAD_H */ +#endif /* MUTT_EMAIL_THREAD_H */ diff --git a/email/url.h b/email/url.h index 706a46dfc..3465ec47b 100644 --- a/email/url.h +++ b/email/url.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _EMAIL_URL_H -#define _EMAIL_URL_H +#ifndef MUTT_EMAIL_URL_H +#define MUTT_EMAIL_URL_H #include #include "mutt/mutt.h" @@ -81,4 +81,4 @@ int url_pct_decode(char *s); void url_pct_encode(char *buf, size_t buflen, const char *src); int url_tostring(struct Url *u, char *buf, size_t buflen, int flags); -#endif /* _EMAIL_URL_H */ +#endif /* MUTT_EMAIL_URL_H */ diff --git a/enriched.h b/enriched.h index a080aef00..f33b3aec7 100644 --- a/enriched.h +++ b/enriched.h @@ -20,12 +20,12 @@ * this program. If not, see . */ -#ifndef _MUTT_ENRICHED_H -#define _MUTT_ENRICHED_H +#ifndef MUTT_ENRICHED_H +#define MUTT_ENRICHED_H struct Body; struct State; int text_enriched_handler(struct Body *a, struct State *s); -#endif /* _MUTT_ENRICHED_H */ +#endif /* MUTT_ENRICHED_H */ diff --git a/enter_state.h b/enter_state.h index 30dc710ea..f140998ce 100644 --- a/enter_state.h +++ b/enter_state.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_ENTER_STATE_H -#define _MUTT_ENTER_STATE_H +#ifndef MUTT_ENTER_STATE_H +#define MUTT_ENTER_STATE_H #include @@ -41,4 +41,4 @@ struct EnterState void mutt_enter_state_free(struct EnterState **esp); struct EnterState *mutt_enter_state_new(void); -#endif /* _MUTT_ENTER_STATE_H */ +#endif /* MUTT_ENTER_STATE_H */ diff --git a/filter.h b/filter.h index cae995206..61cd7e708 100644 --- a/filter.h +++ b/filter.h @@ -18,8 +18,8 @@ * this program. If not, see . */ -#ifndef _MUTT_FILTER_H -#define _MUTT_FILTER_H +#ifndef MUTT_FILTER_H +#define MUTT_FILTER_H #include #include @@ -29,4 +29,4 @@ pid_t mutt_create_filter_fd(const char *cmd, FILE **in, FILE **out, FILE **err, pid_t mutt_create_filter(const char *s, FILE **in, FILE **out, FILE **err); int mutt_wait_filter(pid_t pid); -#endif /* _MUTT_FILTER_H */ +#endif /* MUTT_FILTER_H */ diff --git a/format_flags.h b/format_flags.h index 27c8da5f4..9a8299ea8 100644 --- a/format_flags.h +++ b/format_flags.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_FORMAT_FLAGS_H -#define _MUTT_FORMAT_FLAGS_H +#ifndef MUTT_FORMAT_FLAGS_H +#define MUTT_FORMAT_FLAGS_H #include @@ -66,4 +66,4 @@ typedef const char *format_t(char *buf, size_t buflen, size_t col, int cols, const char *if_str, const char *else_str, unsigned long data, enum FormatFlag flags); -#endif /* _MUTT_FORMAT_FLAGS_H */ +#endif /* MUTT_FORMAT_FLAGS_H */ diff --git a/functions.h b/functions.h index dcdcea96a..43a53df5b 100644 --- a/functions.h +++ b/functions.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_FUNCTIONS_H -#define _MUTT_FUNCTIONS_H +#ifndef MUTT_FUNCTIONS_H +#define MUTT_FUNCTIONS_H /* * This file contains the structures needed to parse ``bind'' commands, as @@ -616,4 +616,4 @@ const struct Binding OpMix[] = { /* map: mixmaster */ #endif /* MIXMASTER */ // clang-format on -#endif /* _MUTT_FUNCTIONS_H */ +#endif /* MUTT_FUNCTIONS_H */ diff --git a/globals.h b/globals.h index af194bc6e..a0b1511cb 100644 --- a/globals.h +++ b/globals.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_GLOBALS_H -#define _MUTT_GLOBALS_H +#ifndef MUTT_GLOBALS_H +#define MUTT_GLOBALS_H #include #include @@ -288,4 +288,4 @@ WHERE bool XCommentTo; ///< Config: (nntp) Add 'X-Comment-To WHERE bool VirtualSpoolfile; ///< Config: (notmuch) Use the first virtual mailbox as a spool file #endif -#endif /* _MUTT_GLOBALS_H */ +#endif /* MUTT_GLOBALS_H */ diff --git a/group.h b/group.h index 5be73f3a8..6cb404e32 100644 --- a/group.h +++ b/group.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_GROUP_H -#define _MUTT_GROUP_H +#ifndef MUTT_GROUP_H +#define MUTT_GROUP_H #include @@ -64,4 +64,4 @@ int mutt_group_context_remove_addrlist(struct GroupContext *ctx, struct Address struct Group *mutt_pattern_group(const char *k); -#endif /* _MUTT_GROUP_H */ +#endif /* MUTT_GROUP_H */ diff --git a/handler.h b/handler.h index be2cd8415..c46ddc2cc 100644 --- a/handler.h +++ b/handler.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HANDLER_H -#define _MUTT_HANDLER_H +#ifndef MUTT_HANDLER_H +#define MUTT_HANDLER_H #include #include @@ -43,4 +43,4 @@ bool mutt_can_decode(struct Body *a); void mutt_decode_attachment(struct Body *b, struct State *s); void mutt_decode_base64(struct State *s, size_t len, bool istext, iconv_t cd); -#endif /* _MUTT_HANDLER_H */ +#endif /* MUTT_HANDLER_H */ diff --git a/hcache/backend.h b/hcache/backend.h index 7cd110576..ce1d87c3d 100644 --- a/hcache/backend.h +++ b/hcache/backend.h @@ -23,8 +23,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HCACHE_BACKEND_H -#define _MUTT_HCACHE_BACKEND_H +#ifndef MUTT_HCACHE_BACKEND_H +#define MUTT_HCACHE_BACKEND_H #include @@ -113,4 +113,4 @@ struct HcacheOps .backend = hcache_##_name##_backend, \ }; -#endif /* _MUTT_HCACHE_BACKEND_H */ +#endif /* MUTT_HCACHE_BACKEND_H */ diff --git a/hcache/hcache.h b/hcache/hcache.h index a6be30aee..3d14f8854 100644 --- a/hcache/hcache.h +++ b/hcache/hcache.h @@ -45,8 +45,8 @@ * | hcache/tc.c | @subpage hc_tc | */ -#ifndef _MUTT_HCACHE_H -#define _MUTT_HCACHE_H +#ifndef MUTT_HCACHE_HCACHE_H +#define MUTT_HCACHE_HCACHE_H #include #include @@ -208,4 +208,4 @@ const char *mutt_hcache_backend_list(void); */ bool mutt_hcache_is_valid_backend(const char *s); -#endif /* _MUTT_HCACHE_H */ +#endif /* MUTT_HCACHE_HCACHE_H */ diff --git a/hcache/serialize.h b/hcache/serialize.h index 5fd9b4429..96d775cca 100644 --- a/hcache/serialize.h +++ b/hcache/serialize.h @@ -23,8 +23,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HCACHE_SERIALIZE_H -#define _MUTT_HCACHE_SERIALIZE_H +#ifndef MUTT_HCACHE_SERIALIZE_H +#define MUTT_HCACHE_SERIALIZE_H #include #include @@ -60,4 +60,4 @@ void serial_restore_stailq(struct ListHead *l, const unsigned char *d, void * mutt_hcache_dump(header_cache_t *h, const struct Header *header, int *off, unsigned int uidvalidity); struct Header *mutt_hcache_restore(const unsigned char *d); -#endif /* _MUTT_HCACHE_SERIALIZE_H */ +#endif /* MUTT_HCACHE_SERIALIZE_H */ diff --git a/imap/auth.h b/imap/auth.h index bdf9fb01e..3a46a5d10 100644 --- a/imap/auth.h +++ b/imap/auth.h @@ -23,8 +23,8 @@ /* common defs for authenticators. A good place to set up a generic callback * system */ -#ifndef _IMAP_AUTH_H -#define _IMAP_AUTH_H +#ifndef MUTT_IMAP_AUTH_H +#define MUTT_IMAP_AUTH_H struct ImapData; @@ -65,4 +65,4 @@ enum ImapAuthRes imap_auth_sasl(struct ImapData *idata, const char *method); #endif enum ImapAuthRes imap_auth_oauth(struct ImapData *idata, const char *method); -#endif /* _IMAP_AUTH_H */ +#endif /* MUTT_IMAP_AUTH_H */ diff --git a/imap/imap.h b/imap/imap.h index b80ea1215..2916b4714 100644 --- a/imap/imap.h +++ b/imap/imap.h @@ -44,8 +44,8 @@ * | imap/util.c | @subpage imap_util | */ -#ifndef _IMAP_IMAP_H -#define _IMAP_IMAP_H +#ifndef MUTT_IMAP_IMAP_H +#define MUTT_IMAP_IMAP_H #include "conn/conn.h" #include @@ -120,4 +120,4 @@ void imap_keepalive(void); void imap_get_parent_path(const char *path, char *buf, size_t buflen); void imap_clean_path(char *path, size_t plen); -#endif /* _IMAP_IMAP_H */ +#endif /* MUTT_IMAP_IMAP_H */ diff --git a/imap/imap_private.h b/imap/imap_private.h index 795cc4a6d..dd9d84095 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _IMAP_PRIVATE_H -#define _IMAP_PRIVATE_H +#ifndef MUTT_IMAP_IMAP_PRIVATE_H +#define MUTT_IMAP_IMAP_PRIVATE_H #include #include @@ -372,4 +372,4 @@ void imap_disallow_reopen(struct Context *ctx); #define imap_hcache_keylen mutt_str_strlen #endif /* USE_HCACHE */ -#endif /* _IMAP_PRIVATE_H */ +#endif /* MUTT_IMAP_IMAP_PRIVATE_H */ diff --git a/imap/message.h b/imap/message.h index e32b4cc7d..48a710684 100644 --- a/imap/message.h +++ b/imap/message.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _IMAP_MESSAGE_H -#define _IMAP_MESSAGE_H +#ifndef MUTT_IMAP_MESSAGE_H +#define MUTT_IMAP_MESSAGE_H #include #include @@ -64,4 +64,4 @@ struct ImapHeader #define HEADER_DATA(ph) ((struct ImapHeaderData *) ((ph)->data)) -#endif /* _IMAP_MESSAGE_H */ +#endif /* MUTT_IMAP_MESSAGE_H */ diff --git a/init.h b/init.h index 854075566..0323bc06e 100644 --- a/init.h +++ b/init.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_INIT_H -#define _MUTT_INIT_H +#ifndef MUTT_INIT_H +#define MUTT_INIT_H #ifdef _MAKEDOC #include "config.h" @@ -4746,4 +4746,4 @@ const struct Command Commands[] = { }; // clang-format on -#endif /* _MUTT_INIT_H */ +#endif /* MUTT_INIT_H */ diff --git a/keymap.h b/keymap.h index 6036b2af4..22e50ea1c 100644 --- a/keymap.h +++ b/keymap.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_KEYMAP_H -#define _MUTT_KEYMAP_H +#ifndef MUTT_KEYMAP_H +#define MUTT_KEYMAP_H #include #include "mutt/mutt.h" @@ -136,4 +136,4 @@ int mutt_parse_exec(struct Buffer *buf, struct Buffer *s, unsigned long data, st int mutt_parse_macro(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err); int mutt_parse_push(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err); -#endif /* _MUTT_KEYMAP_H */ +#endif /* MUTT_KEYMAP_H */ diff --git a/mailbox.h b/mailbox.h index c270067fc..1e906986f 100644 --- a/mailbox.h +++ b/mailbox.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MAILBOX_H -#define _MUTT_MAILBOX_H +#ifndef MUTT_MAILBOX_H +#define MUTT_MAILBOX_H #include #include @@ -113,4 +113,4 @@ bool mutt_mailbox_notify(void); int mutt_parse_mailboxes(struct Buffer *path, struct Buffer *s, unsigned long data, struct Buffer *err); int mutt_parse_unmailboxes(struct Buffer *path, struct Buffer *s, unsigned long data, struct Buffer *err); -#endif /* _MUTT_MAILBOX_H */ +#endif /* MUTT_MAILBOX_H */ diff --git a/maildir/maildir.h b/maildir/maildir.h index 1b807a9c1..eae031d96 100644 --- a/maildir/maildir.h +++ b/maildir/maildir.h @@ -30,8 +30,8 @@ * | maildir/mh.c | @subpage maildir_maildir | */ -#ifndef _MAILDIR_MAILDIR_H -#define _MAILDIR_MAILDIR_H +#ifndef MUTT_MAILDIR_MAILDIR_H +#define MUTT_MAILDIR_MAILDIR_H #include #include @@ -75,4 +75,4 @@ int mh_sync_mailbox_message(struct Context *ctx, int msgno, header_ca int mh_sync_mailbox_message(struct Context *ctx, int msgno); #endif -#endif /* _MAILDIR_MAILDIR_H */ +#endif /* MUTT_MAILDIR_MAILDIR_H */ diff --git a/mbox/mbox.h b/mbox/mbox.h index 6f963b616..02ab76d4e 100644 --- a/mbox/mbox.h +++ b/mbox/mbox.h @@ -30,8 +30,8 @@ * | mbox/mbox.c | @subpage mbox_mbox | */ -#ifndef _MBOX_MBOX_H -#define _MBOX_MBOX_H +#ifndef MUTT_MBOX_MBOX_H +#define MUTT_MBOX_MBOX_H struct Context; struct stat; @@ -44,4 +44,4 @@ extern struct MxOps mx_mmdf_ops; void mbox_reset_atime(struct Context *ctx, struct stat *st); int mbox_path_probe(const char *path, const struct stat *st); -#endif /* _MBOX_MBOX_H */ +#endif /* MUTT_MBOX_MBOX_H */ diff --git a/monitor.h b/monitor.h index fb11feef8..dedc1bc1c 100644 --- a/monitor.h +++ b/monitor.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MONITOR_H -#define _MUTT_MONITOR_H +#ifndef MUTT_MONITOR_H +#define MUTT_MONITOR_H extern int MonitorFilesChanged; extern int MonitorContextChanged; @@ -32,4 +32,4 @@ int mutt_monitor_add(struct Mailbox *b); int mutt_monitor_remove(struct Mailbox *b); int mutt_monitor_poll(void); -#endif /* _MUTT_MONITOR_H */ +#endif /* MUTT_MONITOR_H */ diff --git a/mutt.h b/mutt.h index 5878071ec..75bdfa946 100644 --- a/mutt.h +++ b/mutt.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_H -#define _MUTT_H +#ifndef MUTT_MUTT_H +#define MUTT_MUTT_H #include #include @@ -255,4 +255,4 @@ int mutt_parse_rc_line(/* const */ char *line, struct Buffer *token, struct Buff int mutt_query_variables(struct ListHead *queries); void reset_value(const char *name); -#endif /* _MUTT_H */ +#endif /* MUTT_MUTT_H */ diff --git a/mutt/base64.h b/mutt/base64.h index d2a6ed799..745f2d13c 100644 --- a/mutt/base64.h +++ b/mutt/base64.h @@ -18,8 +18,8 @@ * this program. If not, see . */ -#ifndef _MUTT_BASE64_H -#define _MUTT_BASE64_H +#ifndef MUTT_LIB_BASE64_H +#define MUTT_LIB_BASE64_H #include @@ -30,4 +30,4 @@ extern const int Index64[]; int mutt_b64_decode(const char *in, char *out, size_t olen); size_t mutt_b64_encode(const char *in, size_t inlen, char *out, size_t outlen); -#endif /* _MUTT_BASE64_H */ +#endif /* MUTT_LIB_BASE64_H */ diff --git a/mutt/buffer.h b/mutt/buffer.h index 330a56c27..32892621d 100644 --- a/mutt/buffer.h +++ b/mutt/buffer.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_BUFFER_H -#define _MUTT_BUFFER_H +#ifndef MUTT_LIB_BUFFER_H +#define MUTT_LIB_BUFFER_H #include #include @@ -53,4 +53,4 @@ struct Buffer *mutt_buffer_new(void); int mutt_buffer_printf(struct Buffer *buf, const char *fmt, ...); void mutt_buffer_reset(struct Buffer *b); -#endif /* _MUTT_BUFFER_H */ +#endif /* MUTT_LIB_BUFFER_H */ diff --git a/mutt/charset.h b/mutt/charset.h index b526094eb..3ad70bf43 100644 --- a/mutt/charset.h +++ b/mutt/charset.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_CHARSET_H -#define _MUTT_CHARSET_H +#ifndef MUTT_LIB_CHARSET_H +#define MUTT_LIB_CHARSET_H #include #include @@ -106,4 +106,4 @@ void mutt_ch_set_charset(const char *charset); #define mutt_ch_is_utf8(a) mutt_ch_chscmp(a, "utf-8") #define mutt_ch_is_us_ascii(a) mutt_ch_chscmp(a, "us-ascii") -#endif +#endif /* MUTT_LIB_CHARSET_H */ diff --git a/mutt/date.h b/mutt/date.h index 2d88be729..e40420b67 100644 --- a/mutt/date.h +++ b/mutt/date.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_DATE_H -#define _MUTT_DATE_H +#ifndef MUTT_LIB_DATE_H +#define MUTT_LIB_DATE_H #include #include @@ -49,4 +49,4 @@ void mutt_date_normalize_time(struct tm *tm); time_t mutt_date_parse_date(const char *s, struct Tz *tz_out); time_t mutt_date_parse_imap(char *s); -#endif /* _MUTT_DATE_H */ +#endif /* MUTT_LIB_DATE_H */ diff --git a/mutt/envlist.h b/mutt/envlist.h index e79718163..d06560745 100644 --- a/mutt/envlist.h +++ b/mutt/envlist.h @@ -22,8 +22,8 @@ #include -#ifndef _MUTT_ENVLIST_H -#define _MUTT_ENVLIST_H +#ifndef MUTT_LIB_ENVLIST_H +#define MUTT_LIB_ENVLIST_H void mutt_envlist_free(void); char **mutt_envlist_getlist(void); @@ -31,4 +31,4 @@ void mutt_envlist_init(char *envp[]); bool mutt_envlist_set(const char *name, const char *value, bool overwrite); bool mutt_envlist_unset(const char *name); -#endif /* _MUTT_ENVLIST_H */ +#endif /* MUTT_LIB_ENVLIST_H */ diff --git a/mutt/exit.h b/mutt/exit.h index 0d46ba384..48e90f913 100644 --- a/mutt/exit.h +++ b/mutt/exit.h @@ -20,9 +20,9 @@ * this program. If not, see . */ -#ifndef _MUTT_EXIT_H -#define _MUTT_EXIT_H +#ifndef MUTT_LIB_EXIT_H +#define MUTT_LIB_EXIT_H void mutt_exit(int code); -#endif /* _MUTT_EXIT_H */ +#endif /* MUTT_LIB_EXIT_H */ diff --git a/mutt/file.h b/mutt/file.h index 85fab0f39..693d790cf 100644 --- a/mutt/file.h +++ b/mutt/file.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_FILE_H -#define _MUTT_FILE_H +#ifndef MUTT_LIB_FILE_H +#define MUTT_LIB_FILE_H #include #include @@ -69,4 +69,4 @@ void mutt_file_unlink(const char *s); void mutt_file_unlink_empty(const char *path); int mutt_file_unlock(int fd); -#endif /* _MUTT_FILE_H */ +#endif /* MUTT_LIB_FILE_H */ diff --git a/mutt/hash.h b/mutt/hash.h index 6e2247f05..a90eb9ce6 100644 --- a/mutt/hash.h +++ b/mutt/hash.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HASH_H -#define _MUTT_HASH_H +#ifndef MUTT_LIB_HASH_H +#define MUTT_LIB_HASH_H #include #include @@ -100,4 +100,4 @@ struct HashWalkState struct HashElem *mutt_hash_walk(const struct Hash *table, struct HashWalkState *state); -#endif /* _MUTT_HASH_H */ +#endif /* MUTT_LIB_HASH_H */ diff --git a/mutt/history.h b/mutt/history.h index c77df2154..c803e87ee 100644 --- a/mutt/history.h +++ b/mutt/history.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HISTORY_H -#define _MUTT_HISTORY_H +#ifndef MUTT_LIB_HISTORY_H +#define MUTT_LIB_HISTORY_H #include #include @@ -60,4 +60,4 @@ void mutt_hist_reset_state(enum HistoryClass hclass); void mutt_hist_save_scratch(enum HistoryClass hclass, const char *str); int mutt_hist_search(char *search_buf, enum HistoryClass hclass, char **matches); -#endif /* _MUTT_HISTORY_H */ +#endif /* MUTT_LIB_HISTORY_H */ diff --git a/mutt/list.h b/mutt/list.h index 800f3fdf6..21d4ec54c 100644 --- a/mutt/list.h +++ b/mutt/list.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_LIST_H -#define _MUTT_LIST_H +#ifndef MUTT_LIB_LIST_H +#define MUTT_LIB_LIST_H #include #include "queue.h" @@ -60,4 +60,4 @@ struct ListNode *mutt_list_insert_head(struct ListHead *h, char *s); struct ListNode *mutt_list_insert_tail(struct ListHead *h, char *s); bool mutt_list_match(const char *s, struct ListHead *h); -#endif /* _MUTT_LIST_H */ +#endif /* MUTT_LIB_LIST_H */ diff --git a/mutt/logging.h b/mutt/logging.h index ab5a8c38d..7e310d713 100644 --- a/mutt/logging.h +++ b/mutt/logging.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_LOGGING_H -#define _MUTT_LOGGING_H +#ifndef MUTT_LIB_LOGGING_H +#define MUTT_LIB_LOGGING_H #include #include @@ -105,4 +105,4 @@ int log_file_set_filename(const char *file, bool verbose); int log_file_set_level(int level, bool verbose); void log_file_set_version(const char *version); -#endif /* _MUTT_LOGGING_H */ +#endif /* MUTT_LIB_LOGGING_H */ diff --git a/mutt/mapping.h b/mutt/mapping.h index d8b3ccd01..1a5a1c13b 100644 --- a/mutt/mapping.h +++ b/mutt/mapping.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MAPPING_H -#define _MUTT_MAPPING_H +#ifndef MUTT_LIB_MAPPING_H +#define MUTT_LIB_MAPPING_H /** * struct Mapping - Mapping between user-readable string and a constant @@ -35,4 +35,4 @@ struct Mapping const char *mutt_map_get_name(int val, const struct Mapping *map); int mutt_map_get_value(const char *name, const struct Mapping *map); -#endif /* _MUTT_MAPPING_H */ +#endif /* MUTT_LIB_MAPPING_H */ diff --git a/mutt/mbyte.h b/mutt/mbyte.h index 7b715cf47..66eff1694 100644 --- a/mutt/mbyte.h +++ b/mutt/mbyte.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MBYTE_H -#define _MUTT_MBYTE_H +#ifndef MUTT_LIB_MBYTE_H +#define MUTT_LIB_MBYTE_H #include #include @@ -54,4 +54,4 @@ int mutt_mb_wcwidth(wchar_t wc); int mutt_mb_width(const char *str, int col, bool display); size_t mutt_mb_width_ceiling(const wchar_t *s, size_t n, int w1); -#endif /* _MUTT_MBYTE_H */ +#endif /* MUTT_LIB_MBYTE_H */ diff --git a/mutt/md5.h b/mutt/md5.h index 4d931b161..172fa6b65 100644 --- a/mutt/md5.h +++ b/mutt/md5.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MD5_H -#define _MUTT_MD5_H +#ifndef MUTT_LIB_MD5_H +#define MUTT_LIB_MD5_H #include #include @@ -53,4 +53,4 @@ void mutt_md5_process(const char *string, struct Md5Ctx *ctx); void mutt_md5_process_bytes(const void *buffer, size_t len, struct Md5Ctx *ctx); void mutt_md5_toascii(const void *digest, char *resbuf); -#endif /* _MUTT_MD5_H */ +#endif /* MUTT_LIB_MD5_H */ diff --git a/mutt/memory.h b/mutt/memory.h index f5370fc1e..8ed065ad6 100644 --- a/mutt/memory.h +++ b/mutt/memory.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MEMORY_H -#define _MUTT_MEMORY_H +#ifndef MUTT_LIB_MEMORY_H +#define MUTT_LIB_MEMORY_H #include @@ -45,4 +45,4 @@ void mutt_mem_realloc(void *ptr, size_t size); #define FREE(x) mutt_mem_free(x) -#endif /* _MUTT_MEMORY_H */ +#endif /* MUTT_LIB_MEMORY_H */ diff --git a/mutt/message.h b/mutt/message.h index 620e4d7b7..8c325b958 100644 --- a/mutt/message.h +++ b/mutt/message.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MESSAGE_H -#define _MUTT_MESSAGE_H +#ifndef MUTT_LIB_MESSAGE_H +#define MUTT_LIB_MESSAGE_H #ifdef ENABLE_NLS #include @@ -37,4 +37,4 @@ #define ngettext(x, xs, n) ((n) == 1 ? (x) : (xs)) #endif -#endif /* _MUTT_MESSAGE_H */ +#endif /* MUTT_LIB_MESSAGE_H */ diff --git a/mutt/mutt.h b/mutt/mutt.h index 16b5c0a2e..ffc53041f 100644 --- a/mutt/mutt.h +++ b/mutt/mutt.h @@ -52,8 +52,8 @@ * the library, but none depends on source from outside. */ -#ifndef _MUTT_MUTT_H -#define _MUTT_MUTT_H +#ifndef MUTT_LIB_MUTT_H +#define MUTT_LIB_MUTT_H #include "base64.h" #include "buffer.h" @@ -78,4 +78,4 @@ #include "signal2.h" #include "string2.h" -#endif /* _MUTT_MUTT_H */ +#endif /* MUTT_LIB_MUTT_H */ diff --git a/mutt/path.h b/mutt/path.h index 758bb5f31..36c7cf6f5 100644 --- a/mutt/path.h +++ b/mutt/path.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_PATH_H -#define _MUTT_PATH_H +#ifndef MUTT_LIB_PATH_H +#define MUTT_LIB_PATH_H #include #include @@ -40,4 +40,4 @@ bool mutt_path_tidy_dotdot(char *buf); bool mutt_path_tidy_slash(char *buf); int mutt_path_to_absolute(char *path, const char *reference); -#endif /* _MUTT_PATH_H */ +#endif /* MUTT_LIB_PATH_H */ diff --git a/mutt/regex3.h b/mutt/regex3.h index c3bbfa2bb..ab7bdc6b4 100644 --- a/mutt/regex3.h +++ b/mutt/regex3.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_REGEX_H -#define _MUTT_REGEX_H +#ifndef MUTT_LIB_REGEX_H +#define MUTT_LIB_REGEX_H #include #include @@ -101,4 +101,4 @@ bool mutt_replacelist_match(struct ReplaceList *rl, char *buf struct ReplaceListNode *mutt_replacelist_new(void); int mutt_replacelist_remove(struct ReplaceList *rl, const char *pat); -#endif /* _MUTT_REGEX_H */ +#endif /* MUTT_LIB_REGEX_H */ diff --git a/mutt/sha1.h b/mutt/sha1.h index a2fb108c7..c2f96237c 100644 --- a/mutt/sha1.h +++ b/mutt/sha1.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _MUTT_SHA1_H -#define _MUTT_SHA1_H +#ifndef MUTT_LIB_SHA1_H +#define MUTT_LIB_SHA1_H #include @@ -44,4 +44,4 @@ void mutt_sha1_update(struct Sha1Ctx *context, const unsigned char *data, uint32 #define SHA_DIGEST_LENGTH 20 -#endif /* _MUTT_SHA1_H */ +#endif /* MUTT_LIB_SHA1_H */ diff --git a/mutt/signal2.h b/mutt/signal2.h index 38aff8c3b..6b4dda430 100644 --- a/mutt/signal2.h +++ b/mutt/signal2.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_SIGNAL_H -#define _MUTT_SIGNAL_H +#ifndef MUTT_LIB_SIGNAL_H +#define MUTT_LIB_SIGNAL_H /** * typedef sig_handler_t - Handler for signals @@ -38,4 +38,4 @@ void mutt_sig_init(sig_handler_t sig_fn, sig_handler_t exit_fn); void mutt_sig_unblock(void); void mutt_sig_unblock_system(bool catch); -#endif /* _MUTT_SIGNAL_H */ +#endif /* MUTT_LIB_SIGNAL_H */ diff --git a/mutt/string2.h b/mutt/string2.h index c7aa71f78..25c19383e 100644 --- a/mutt/string2.h +++ b/mutt/string2.h @@ -24,8 +24,8 @@ * #include */ -#ifndef _MUTT_STRING_H -#define _MUTT_STRING_H +#ifndef MUTT_LIB_STRING_H +#define MUTT_LIB_STRING_H #include #include @@ -103,4 +103,4 @@ char * mutt_str_substr_dup(const char *begin, const char *end); const char *mutt_str_sysexit(int e); int mutt_str_word_casecmp(const char *a, const char *b); -#endif /* _MUTT_STRING_H */ +#endif /* MUTT_LIB_STRING_H */ diff --git a/mutt_account.h b/mutt_account.h index d88d14116..6e06f6018 100644 --- a/mutt_account.h +++ b/mutt_account.h @@ -22,8 +22,8 @@ /* remote host account manipulation (POP/IMAP) */ -#ifndef _MUTT_ACCOUNT_H -#define _MUTT_ACCOUNT_H +#ifndef MUTT_MUTT_ACCOUNT_H +#define MUTT_MUTT_ACCOUNT_H struct Account; struct Url; @@ -68,4 +68,4 @@ int mutt_account_getpass(struct Account *account); void mutt_account_unsetpass(struct Account *account); char *mutt_account_getoauthbearer(struct Account *account); -#endif /* _MUTT_ACCOUNT_H */ +#endif /* MUTT_MUTT_ACCOUNT_H */ diff --git a/mutt_attach.h b/mutt_attach.h index 77bf23825..decae3717 100644 --- a/mutt_attach.h +++ b/mutt_attach.h @@ -22,8 +22,8 @@ /* common protos for compose / attach menus */ -#ifndef _MUTT_ATTACH2_H -#define _MUTT_ATTACH2_H +#ifndef MUTT_MUTT_ATTACH_H +#define MUTT_MUTT_ATTACH_H #include #include @@ -55,4 +55,4 @@ int mutt_pipe_attachment(FILE *fp, struct Body *b, const char *path, char *outfi int mutt_print_attachment(FILE *fp, struct Body *a); int mutt_save_attachment(FILE *fp, struct Body *m, char *path, int flags, struct Header *hdr); -#endif /* _MUTT_ATTACH2_H */ +#endif /* MUTT_MUTT_ATTACH_H */ diff --git a/mutt_body.h b/mutt_body.h index e4322b598..e6da1ad88 100644 --- a/mutt_body.h +++ b/mutt_body.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_BODY2_H -#define _MUTT_BODY2_H +#ifndef MUTT_MUTT_BODY_H +#define MUTT_MUTT_BODY_H #include @@ -29,4 +29,4 @@ struct Body; int mutt_body_copy(FILE *fp, struct Body **tgt, struct Body *src); -#endif /* _MUTT_BODY2_H */ +#endif /* MUTT_MUTT_BODY_H */ diff --git a/mutt_commands.h b/mutt_commands.h index 5b63b3c99..ee35130e3 100644 --- a/mutt_commands.h +++ b/mutt_commands.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_COMMANDS_H -#define _MUTT_COMMANDS_H +#ifndef MUTT_MUTT_COMMANDS_H +#define MUTT_MUTT_COMMANDS_H struct Buffer; @@ -50,4 +50,4 @@ struct Command const struct Command *mutt_command_get(const char *s); void mutt_commands_apply(void *data, void (*application)(void *, const struct Command *)); -#endif /* _MUTT_COMMANDS_H */ +#endif /* MUTT_MUTT_COMMANDS_H */ diff --git a/mutt_curses.h b/mutt_curses.h index c04144613..237ca4b3a 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_CURSES_H -#define _MUTT_CURSES_H +#ifndef MUTT_MUTT_CURSES_H +#define MUTT_MUTT_CURSES_H #include #include "mutt/mutt.h" @@ -235,4 +235,4 @@ extern struct ColorLineHead ColorIndexTagList; #define NORMAL_COLOR attrset(ColorDefs[MT_COLOR_NORMAL]) #endif -#endif /* _MUTT_CURSES_H */ +#endif /* MUTT_MUTT_CURSES_H */ diff --git a/mutt_header.h b/mutt_header.h index 58e61059d..07bcb7626 100644 --- a/mutt_header.h +++ b/mutt_header.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HEADER2_H -#define _MUTT_HEADER2_H +#ifndef MUTT_MUTT_HEADER_H +#define MUTT_MUTT_HEADER_H #include @@ -34,4 +34,4 @@ void mutt_label_hash_remove(struct Context *ctx, struct Header *hdr); int mutt_label_message(struct Header *hdr); void mutt_make_label_hash(struct Context *ctx); -#endif /* _MUTT_HEADER2_H */ +#endif /* MUTT_MUTT_HEADER_H */ diff --git a/mutt_history.h b/mutt_history.h index 42fd861bf..8f16cf6a6 100644 --- a/mutt_history.h +++ b/mutt_history.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_HISTORY2_H -#define _MUTT_HISTORY2_H +#ifndef MUTT_MUTT_HISTORY_H +#define MUTT_MUTT_HISTORY_H #include #include "mutt/mutt.h" @@ -29,5 +29,4 @@ void mutt_hist_complete(char *buf, size_t buflen, enum HistoryClass hclass); bool mutt_hist_listener(const struct ConfigSet *cs, struct HashElem *he, const char *name, enum ConfigEvent ev); -#endif /* _MUTT_HISTORY2_H */ - +#endif /* MUTT_MUTT_HISTORY_H */ diff --git a/mutt_logging.h b/mutt_logging.h index 0e5edbfb2..e816c5d59 100644 --- a/mutt_logging.h +++ b/mutt_logging.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _LOGGING2_H -#define _LOGGING2_H +#ifndef MUTT_MUTT_LOGGING_H +#define MUTT_MUTT_LOGGING_H #include #include @@ -43,4 +43,4 @@ int level_validator(const struct ConfigSet *cs, const struct ConfigDef *cdef, i void mutt_clear_error(void); -#endif /* _LOGGING2_H */ +#endif /* MUTT_MUTT_LOGGING_H */ diff --git a/mutt_lua.h b/mutt_lua.h index 3ef737699..e47e599db 100644 --- a/mutt_lua.h +++ b/mutt_lua.h @@ -20,12 +20,12 @@ * this program. If not, see . */ -#ifndef _MUTT_LUA_H -#define _MUTT_LUA_H +#ifndef MUTT_MUTT_LUA_H +#define MUTT_MUTT_LUA_H struct Buffer; int mutt_lua_parse(struct Buffer *tmp, struct Buffer *s, unsigned long data, struct Buffer *err); int mutt_lua_source_file(struct Buffer *tmp, struct Buffer *s, unsigned long data, struct Buffer *err); -#endif /* _MUTT_LUA_H */ +#endif /* MUTT_MUTT_LUA_H */ diff --git a/mutt_options.h b/mutt_options.h index 2b4f0558e..eb9d6468b 100644 --- a/mutt_options.h +++ b/mutt_options.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_OPTIONS_H -#define _MUTT_OPTIONS_H +#ifndef MUTT_MUTT_OPTIONS_H +#define MUTT_MUTT_OPTIONS_H #include #include @@ -34,4 +34,4 @@ int mutt_option_to_string(const struct ConfigDef *opt, char *val, size_t len); bool mutt_option_get(const char *s, struct ConfigDef *opt); int mutt_option_set(const struct ConfigDef *val, struct Buffer *err); -#endif /* _MUTT_OPTIONS_H */ +#endif /* MUTT_MUTT_OPTIONS_H */ diff --git a/mutt_parse.h b/mutt_parse.h index 1f39f52b8..509aaafa4 100644 --- a/mutt_parse.h +++ b/mutt_parse.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef MUTT_PARSE_H -#define MUTT_PARSE_H +#ifndef MUTT_MUTT_PARSE_H +#define MUTT_MUTT_PARSE_H struct Context; struct Header; @@ -29,4 +29,4 @@ struct Header; int mutt_count_body_parts(struct Context *ctx, struct Header *hdr); void mutt_parse_mime_message(struct Context *ctx, struct Header *cur); -#endif /* MUTT_PARSE_H */ +#endif /* MUTT_MUTT_PARSE_H */ diff --git a/mutt_socket.h b/mutt_socket.h index 42d110156..b83271156 100644 --- a/mutt_socket.h +++ b/mutt_socket.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_SOCKET_H -#define _MUTT_SOCKET_H +#ifndef MUTT_MUTT_SOCKET_H +#define MUTT_MUTT_SOCKET_H struct Account; struct Connection; @@ -38,4 +38,4 @@ struct Connection *mutt_conn_find(const struct Connection *start, const struct A #define mutt_socket_send_d(conn, buffer, level) mutt_socket_write_d(conn, buffer, mutt_str_strlen(buffer), level) #define mutt_socket_write_n(A, B, C) mutt_socket_write_d(A, B, C, MUTT_SOCK_LOG_CMD) -#endif /* _MUTT_SOCKET_H */ +#endif /* MUTT_MUTT_SOCKET_H */ diff --git a/mutt_thread.h b/mutt_thread.h index efe658611..5a278402f 100644 --- a/mutt_thread.h +++ b/mutt_thread.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_THREAD2_H -#define _MUTT_THREAD2_H +#ifndef MUTT_MUTT_THREAD_H +#define MUTT_MUTT_THREAD_H #include @@ -73,4 +73,4 @@ int mutt_parent_message(struct Context *ctx, struct Header *hdr, bool find_root) void mutt_set_virtual(struct Context *ctx); struct Hash *mutt_make_id_hash(struct Context *ctx); -#endif /* _MUTT_THREAD2_H */ +#endif /* MUTT_MUTT_THREAD_H */ diff --git a/mutt_window.h b/mutt_window.h index 51a6f2aa4..31fd1c564 100644 --- a/mutt_window.h +++ b/mutt_window.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_WINDOW_H -#define _MUTT_WINDOW_H +#ifndef MUTT_MUTT_WINDOW_H +#define MUTT_MUTT_WINDOW_H #include "mutt_curses.h" @@ -59,4 +59,4 @@ void mutt_window_reflow_message_rows(int mw_rows); void mutt_window_reflow(void); int mutt_window_wrap_cols(struct MuttWindow *win, short wrap); -#endif /* _MUTT_WINDOW_H */ +#endif /* MUTT_MUTT_WINDOW_H */ diff --git a/mx.h b/mx.h index 2a5054f14..ae184d269 100644 --- a/mx.h +++ b/mx.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MX_H -#define _MUTT_MX_H +#ifndef MUTT_MX_H +#define MUTT_MX_H #include #include @@ -255,4 +255,4 @@ bool mx_tags_is_supported(struct Context *ctx); void mx_update_context(struct Context *ctx, int new_messages); void mx_update_tables(struct Context *ctx, bool committing); -#endif /* _MUTT_MX_H */ +#endif /* MUTT_MX_H */ diff --git a/myvar.h b/myvar.h index 1e3165caf..d3b81f3f7 100644 --- a/myvar.h +++ b/myvar.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_MYVAR_H -#define _MUTT_MYVAR_H +#ifndef MUTT_MYVAR_H +#define MUTT_MYVAR_H #include "mutt/mutt.h" @@ -42,4 +42,4 @@ void myvar_del(const char *var); const char *myvar_get(const char *var); void myvar_set(const char *var, const char *val); -#endif /* _MUTT_MYVAR_H */ +#endif /* MUTT_MYVAR_H */ diff --git a/ncrypt/crypt.h b/ncrypt/crypt.h index dda2f15e0..5489155d0 100644 --- a/ncrypt/crypt.h +++ b/ncrypt/crypt.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_CRYPT_H -#define _NCRYPT_CRYPT_H +#ifndef MUTT_NCRYPT_CRYPT_H +#define MUTT_NCRYPT_CRYPT_H #include @@ -34,4 +34,4 @@ const char *crypt_get_fingerprint_or_id(char *p, const char **pphint, const char bool crypt_is_numerical_keyid(const char *s); int crypt_write_signed(struct Body *a, struct State *s, const char *tempfile); -#endif /* _NCRYPT_CRYPT_H */ +#endif /* MUTT_NCRYPT_CRYPT_H */ diff --git a/ncrypt/crypt_gpgme.h b/ncrypt/crypt_gpgme.h index 0d5b6fe64..1ae26bce3 100644 --- a/ncrypt/crypt_gpgme.h +++ b/ncrypt/crypt_gpgme.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_CRYPT_GPGME_H -#define _NCRYPT_CRYPT_GPGME_H +#ifndef MUTT_NCRYPT_CRYPT_GPGME_H +#define MUTT_NCRYPT_CRYPT_GPGME_H #include #include @@ -58,4 +58,4 @@ int smime_gpgme_verify_sender(struct Header *h); const char *mutt_gpgme_print_version(void); -#endif /* _NCRYPT_CRYPT_GPGME_H */ +#endif /* MUTT_NCRYPT_CRYPT_GPGME_H */ diff --git a/ncrypt/crypt_mod.h b/ncrypt/crypt_mod.h index 89839645d..df962ff10 100644 --- a/ncrypt/crypt_mod.h +++ b/ncrypt/crypt_mod.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_CRYPT_MOD_H -#define _NCRYPT_CRYPT_MOD_H +#ifndef MUTT_NCRYPT_CRYPT_MOD_H +#define MUTT_NCRYPT_CRYPT_MOD_H #include #include @@ -207,4 +207,4 @@ struct CryptModuleSpecs void crypto_module_register(struct CryptModuleSpecs *specs); struct CryptModuleSpecs *crypto_module_lookup(int identifier); -#endif /* _NCRYPT_CRYPT_MOD_H */ +#endif /* MUTT_NCRYPT_CRYPT_MOD_H */ diff --git a/ncrypt/cryptglue.h b/ncrypt/cryptglue.h index 611263eea..e169b52a1 100644 --- a/ncrypt/cryptglue.h +++ b/ncrypt/cryptglue.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_CRYPTGLUE_H -#define _NCRYPT_CRYPTGLUE_H +#ifndef MUTT_NCRYPT_CRYPTGLUE_H +#define MUTT_NCRYPT_CRYPTGLUE_H #include @@ -48,4 +48,4 @@ int crypt_smime_valid_passphrase(void); int crypt_smime_verify_one(struct Body *sigbdy, struct State *s, const char *tempf); void crypt_smime_void_passphrase(void); -#endif /* _NCRYPT_CRYPTGLUE_H */ +#endif /* MUTT_NCRYPT_CRYPTGLUE_H */ diff --git a/ncrypt/gnupgparse.h b/ncrypt/gnupgparse.h index 18ed8cf08..113340d6a 100644 --- a/ncrypt/gnupgparse.h +++ b/ncrypt/gnupgparse.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_GNUPGPARSE_H -#define _NCRYPT_GNUPGPARSE_H +#ifndef MUTT_NCRYPT_GNUPGPARSE_H +#define MUTT_NCRYPT_GNUPGPARSE_H #include "pgpkey.h" @@ -29,4 +29,4 @@ struct ListHead; struct PgpKeyInfo * pgp_get_candidates(enum PgpRing keyring, struct ListHead *hints); -#endif /* _NCRYPT_GNUPGPARSE_H */ +#endif /* MUTT_NCRYPT_GNUPGPARSE_H */ diff --git a/ncrypt/ncrypt.h b/ncrypt/ncrypt.h index 588e70f03..92296336a 100644 --- a/ncrypt/ncrypt.h +++ b/ncrypt/ncrypt.h @@ -46,8 +46,8 @@ * | ncrypt/smime.c | @subpage crypt_smime | */ -#ifndef _NCRYPT_NCRYPT_H -#define _NCRYPT_NCRYPT_H +#ifndef MUTT_NCRYPT_NCRYPT_H +#define MUTT_NCRYPT_NCRYPT_H #include #include @@ -214,4 +214,4 @@ int crypt_smime_verify_sender(struct Header *h); /* crypt_mod.c */ void crypto_module_free(void); -#endif /* _NCRYPT_NCRYPT_H */ +#endif /* MUTT_NCRYPT_NCRYPT_H */ diff --git a/ncrypt/pgp.h b/ncrypt/pgp.h index 5c65ad46c..eed48e77a 100644 --- a/ncrypt/pgp.h +++ b/ncrypt/pgp.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_PGP_H -#define _NCRYPT_PGP_H +#ifndef MUTT_NCRYPT_PGP_H +#define MUTT_NCRYPT_PGP_H #include #include @@ -61,4 +61,4 @@ struct Body *pgp_class_sign_message(struct Body *a); int pgp_class_send_menu(struct Header *msg); -#endif /* _NCRYPT_PGP_H */ +#endif /* MUTT_NCRYPT_PGP_H */ diff --git a/ncrypt/pgpinvoke.h b/ncrypt/pgpinvoke.h index cfde0477f..1545b590f 100644 --- a/ncrypt/pgpinvoke.h +++ b/ncrypt/pgpinvoke.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_PGPINVOKE_H -#define _NCRYPT_PGPINVOKE_H +#ifndef MUTT_NCRYPT_PGPINVOKE_H +#define MUTT_NCRYPT_PGPINVOKE_H #include #include @@ -46,4 +46,4 @@ pid_t pgp_invoke_traditional(FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgp pid_t pgp_invoke_verify (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *fname, const char *sig_fname); pid_t pgp_invoke_verify_key (FILE **pgpin, FILE **pgpout, FILE **pgperr, int pgpinfd, int pgpoutfd, int pgperrfd, const char *uids); -#endif /* _NCRYPT_PGPINVOKE_H */ +#endif /* MUTT_NCRYPT_PGPINVOKE_H */ diff --git a/ncrypt/pgpkey.h b/ncrypt/pgpkey.h index ee50180cd..bd10bb4e5 100644 --- a/ncrypt/pgpkey.h +++ b/ncrypt/pgpkey.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_PGPKEY_H -#define _NCRYPT_PGPKEY_H +#ifndef MUTT_NCRYPT_PGPKEY_H +#define MUTT_NCRYPT_PGPKEY_H #include @@ -42,4 +42,4 @@ struct PgpKeyInfo *pgp_ask_for_key(char *tag, char *whatfor, short abilities, en struct PgpKeyInfo *pgp_getkeybyaddr(struct Address *a, short abilities, enum PgpRing keyring, bool oppenc_mode); struct PgpKeyInfo *pgp_getkeybystr(char *p, short abilities, enum PgpRing keyring); -#endif /* _NCRYPT_PGPKEY_H */ +#endif /* MUTT_NCRYPT_PGPKEY_H */ diff --git a/ncrypt/pgplib.h b/ncrypt/pgplib.h index 124b5fc1a..393423afa 100644 --- a/ncrypt/pgplib.h +++ b/ncrypt/pgplib.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_PGPLIB_H -#define _NCRYPT_PGPLIB_H +#ifndef MUTT_NCRYPT_PGPLIB_H +#define MUTT_NCRYPT_PGPLIB_H #include #include @@ -70,4 +70,4 @@ struct PgpKeyInfo *pgp_remove_key(struct PgpKeyInfo **klist, struct PgpKeyInfo * struct PgpKeyInfo *pgp_new_keyinfo(void); -#endif /* _NCRYPT_PGPLIB_H */ +#endif /* MUTT_NCRYPT_PGPLIB_H */ diff --git a/ncrypt/pgpmicalg.h b/ncrypt/pgpmicalg.h index 3797daac0..a07e9692d 100644 --- a/ncrypt/pgpmicalg.h +++ b/ncrypt/pgpmicalg.h @@ -20,9 +20,9 @@ * this program. If not, see . */ -#ifndef _NCRYPT_PGPMICALG_H -#define _NCRYPT_PGPMICALG_H +#ifndef MUTT_NCRYPT_PGPMICALG_H +#define MUTT_NCRYPT_PGPMICALG_H const char *pgp_micalg(const char *fname); -#endif /* _NCRYPT_PGPMICALG_H */ +#endif /* MUTT_NCRYPT_PGPMICALG_H */ diff --git a/ncrypt/pgppacket.h b/ncrypt/pgppacket.h index 603d9757d..223370c21 100644 --- a/ncrypt/pgppacket.h +++ b/ncrypt/pgppacket.h @@ -24,8 +24,8 @@ * proper and the PGP public key ring lister. */ -#ifndef _NCRYPT_PGPPACKET_H -#define _NCRYPT_PGPPACKET_H +#ifndef MUTT_NCRYPT_PGPPACKET_H +#define MUTT_NCRYPT_PGPPACKET_H #include @@ -56,4 +56,4 @@ enum PacketTags unsigned char *pgp_read_packet(FILE *fp, size_t *len); void pgp_release_packet(void); -#endif /* _NCRYPT_PGPPACKET_H */ +#endif /* MUTT_NCRYPT_PGPPACKET_H */ diff --git a/ncrypt/smime.h b/ncrypt/smime.h index 536e66432..c2b9a2d8c 100644 --- a/ncrypt/smime.h +++ b/ncrypt/smime.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _NCRYPT_SMIME_H -#define _NCRYPT_SMIME_H +#ifndef MUTT_NCRYPT_SMIME_H +#define MUTT_NCRYPT_SMIME_H #include #include @@ -60,4 +60,4 @@ int smime_class_verify_one(struct Body *sigbdy, struct State *s, const int smime_class_verify_sender(struct Header *h); void smime_class_void_passphrase(void); -#endif /* _NCRYPT_SMIME_H */ +#endif /* MUTT_NCRYPT_SMIME_H */ diff --git a/nntp/nntp.h b/nntp/nntp.h index 54518756b..7a9029146 100644 --- a/nntp/nntp.h +++ b/nntp/nntp.h @@ -33,8 +33,8 @@ * | nntp/nntp.c | @subpage nntp_nntp | */ -#ifndef _NNTP_NNTP_H -#define _NNTP_NNTP_H +#ifndef MUTT_NNTP_NNTP_H +#define MUTT_NNTP_NNTP_H #include #include @@ -178,4 +178,4 @@ int nntp_path_probe(const char *path, const struct stat *st); extern struct MxOps mx_nntp_ops; -#endif /* _NNTP_NNTP_H */ +#endif /* MUTT_NNTP_NNTP_H */ diff --git a/nntp/nntp_private.h b/nntp/nntp_private.h index 26f3cbf65..75cdf52a2 100644 --- a/nntp/nntp_private.h +++ b/nntp/nntp_private.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _NNTP_PRIVATE_H -#define _NNTP_PRIVATE_H +#ifndef MUTT_NNTP_NNTP_PRIVATE_H +#define MUTT_NNTP_NNTP_PRIVATE_H #ifdef USE_HCACHE #include "hcache/hcache.h" @@ -62,4 +62,4 @@ header_cache_t *nntp_hcache_open(struct NntpData *nntp_data); void nntp_hcache_update(struct NntpData *nntp_data, header_cache_t *hc); #endif -#endif /* _NNTP_PRIVATE_H */ +#endif /* MUTT_NNTP_NNTP_PRIVATE_H */ diff --git a/notmuch/mutt_notmuch.h b/notmuch/mutt_notmuch.h index 2c4da6800..14c9f272c 100644 --- a/notmuch/mutt_notmuch.h +++ b/notmuch/mutt_notmuch.h @@ -30,8 +30,8 @@ * | notmuch/mutt_notmuch.c | @subpage nm_notmuch | */ -#ifndef _MUTT_NOTMUCH_H -#define _MUTT_NOTMUCH_H +#ifndef MUTT_NOTMUCH_MUTT_NOTMUCH_H +#define MUTT_NOTMUCH_MUTT_NOTMUCH_H #include #include @@ -81,4 +81,4 @@ int nm_path_probe(const char *path, const struct stat *st); extern struct MxOps mx_notmuch_ops; -#endif /* _MUTT_NOTMUCH_H */ +#endif /* MUTT_NOTMUCH_MUTT_NOTMUCH_H */ diff --git a/opcodes.h b/opcodes.h index 3ad260f30..06211b442 100644 --- a/opcodes.h +++ b/opcodes.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_OPCODES_H -#define _MUTT_OPCODES_H +#ifndef MUTT_OPCODES_H +#define MUTT_OPCODES_H // clang-format off #define OPS_CORE(_fmt) \ @@ -316,4 +316,4 @@ enum mutt_ops { }; // clang-format on -#endif /* _MUTT_OPCODES_H */ +#endif /* MUTT_OPCODES_H */ diff --git a/options.h b/options.h index dfc89bf46..1d081e26c 100644 --- a/options.h +++ b/options.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_OPTIONS_H_ -#define _MUTT_OPTIONS_H_ +#ifndef MUTT_OPTIONS_H +#define MUTT_OPTIONS_H #include #include "where.h" @@ -51,4 +51,4 @@ WHERE bool OptSearchReverse; /**< (pseudo) used by ci_search_command */ WHERE bool OptSortSubthreads; /**< (pseudo) used when $sort_aux changes */ WHERE bool OptViewAttach; /**< (pseudo) signals that we are viewing attachments */ -#endif /* _MUTT_OPTIONS_H_ */ +#endif /* MUTT_OPTIONS_H */ diff --git a/pager.h b/pager.h index 2179db800..f1fbfc852 100644 --- a/pager.h +++ b/pager.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_PAGER_H -#define _MUTT_PAGER_H +#ifndef MUTT_PAGER_H +#define MUTT_PAGER_H #include #include @@ -73,4 +73,4 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e void mutt_clear_pager_position(void); -#endif /* _MUTT_PAGER_H */ +#endif /* MUTT_PAGER_H */ diff --git a/pattern.h b/pattern.h index 91044ccc9..c6e2745c1 100644 --- a/pattern.h +++ b/pattern.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_PATTERN_H -#define _MUTT_PATTERN_H +#ifndef MUTT_PATTERN_H +#define MUTT_PATTERN_H #include #include @@ -104,4 +104,4 @@ int mutt_search_command(int cur, int op); bool mutt_limit_current_thread(struct Header *h); -#endif /* _MUTT_PATTERN_H */ +#endif /* MUTT_PATTERN_H */ diff --git a/pop/pop.h b/pop/pop.h index 35d6a86eb..bd14753da 100644 --- a/pop/pop.h +++ b/pop/pop.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _POP_POP_H -#define _POP_POP_H +#ifndef MUTT_POP_POP_H +#define MUTT_POP_POP_H #include #include "mx.h" @@ -56,4 +56,4 @@ extern struct MxOps mx_pop_ops; void pop_fetch_mail(void); int pop_path_probe(const char *path, const struct stat *st); -#endif /* _POP_POP_H */ +#endif /* MUTT_POP_POP_H */ diff --git a/pop/pop_private.h b/pop/pop_private.h index ed3c44b43..ade12f1ef 100644 --- a/pop/pop_private.h +++ b/pop/pop_private.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _POP_PRIVATE_H -#define _POP_PRIVATE_H +#ifndef MUTT_POP_POP_PRIVATE_H +#define MUTT_POP_POP_PRIVATE_H #include #include @@ -124,4 +124,4 @@ int pop_fetch_data(struct PopData *pop_data, const char *query, struct Progress int pop_reconnect(struct Context *ctx); void pop_logout(struct Context *ctx); -#endif /* _POP_PRIVATE_H */ +#endif /* MUTT_POP_POP_PRIVATE_H */ diff --git a/progress.h b/progress.h index 8070da0aa..31bd99ee2 100644 --- a/progress.h +++ b/progress.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_PROGRESS_H -#define _MUTT_PROGRESS_H +#ifndef MUTT_PROGRESS_H +#define MUTT_PROGRESS_H #include #include "mutt/mutt.h" @@ -50,4 +50,4 @@ void mutt_progress_init(struct Progress *progress, const char *msg, unsigned short flags, unsigned short inc, size_t size); void mutt_progress_update(struct Progress *progress, long pos, int percent); -#endif /* _MUTT_PROGRESS_H */ +#endif /* MUTT_PROGRESS_H */ diff --git a/protos.h b/protos.h index d3514d7a2..6cbab9421 100644 --- a/protos.h +++ b/protos.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_PROTOS_H -#define _MUTT_PROTOS_H +#ifndef MUTT_PROTOS_H +#define MUTT_PROTOS_H #include #include @@ -77,4 +77,4 @@ int wcscasecmp(const wchar_t *a, const wchar_t *b); bool mutt_reply_listener(const struct ConfigSet *cs, struct HashElem *he, const char *name, enum ConfigEvent ev); -#endif /* _MUTT_PROTOS_H */ +#endif /* MUTT_PROTOS_H */ diff --git a/recvattach.h b/recvattach.h index e9254d05d..76224d016 100644 --- a/recvattach.h +++ b/recvattach.h @@ -21,8 +21,8 @@ * this program. If not, see . */ -#ifndef _MUTT_RECVATTACH_H -#define _MUTT_RECVATTACH_H +#ifndef MUTT_RECVATTACH_H +#define MUTT_RECVATTACH_H #include #include @@ -43,4 +43,4 @@ void mutt_update_tree(struct AttachCtx *actx); const char *attach_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, enum FormatFlag flags); void mutt_view_attachments(struct Header *hdr); -#endif /* _MUTT_RECVATTACH_H */ +#endif /* MUTT_RECVATTACH_H */ diff --git a/recvcmd.h b/recvcmd.h index b6a703a06..fe212011b 100644 --- a/recvcmd.h +++ b/recvcmd.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_RECVCMD_H -#define _MUTT_RECVCMD_H +#ifndef MUTT_RECVCMD_H +#define MUTT_RECVCMD_H #include @@ -38,4 +38,4 @@ void mutt_attach_forward(FILE *fp, struct Header *hdr, struct AttachCtx *actx, s void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx, struct Body *cur, int flags); void mutt_attach_mail_sender(FILE *fp, struct Header *hdr, struct AttachCtx *actx, struct Body *cur); -#endif /* _MUTT_RECVCMD_H */ +#endif /* MUTT_RECVCMD_H */ diff --git a/remailer.h b/remailer.h index a0d39ec3d..cb9d0b66e 100644 --- a/remailer.h +++ b/remailer.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_REMAILER_H -#define _MUTT_REMAILER_H +#ifndef MUTT_REMAILER_H +#define MUTT_REMAILER_H #include @@ -61,4 +61,4 @@ int mix_send_message(struct ListHead *chain, const char *tempfile); int mix_check_message(struct Header *msg); void mix_make_chain(struct ListHead *chainhead); -#endif /* _MUTT_REMAILER_H */ +#endif /* MUTT_REMAILER_H */ diff --git a/rfc1524.h b/rfc1524.h index d6f842d90..b4496dc2b 100644 --- a/rfc1524.h +++ b/rfc1524.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_RFC1524_H -#define _MUTT_RFC1524_H +#ifndef MUTT_RFC1524_H +#define MUTT_RFC1524_H #include #include @@ -54,4 +54,4 @@ int rfc1524_expand_command(struct Body *a, char *filename, char *type, char *com int rfc1524_expand_filename(char *nametemplate, char *oldfile, char *newfile, size_t nflen); int rfc1524_mailcap_lookup(struct Body *a, char *type, struct Rfc1524MailcapEntry *entry, int opt); -#endif /* _MUTT_RFC1524_H */ +#endif /* MUTT_RFC1524_H */ diff --git a/rfc3676.h b/rfc3676.h index 89b9440c8..ce1a8be03 100644 --- a/rfc3676.h +++ b/rfc3676.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _MUTT_RFC3676_H -#define _MUTT_RFC3676_H +#ifndef MUTT_RFC3676_H +#define MUTT_RFC3676_H #include @@ -38,4 +38,4 @@ extern short ReflowWrap; int rfc3676_handler(struct Body *a, struct State *s); void rfc3676_space_stuff(struct Header *hdr); -#endif /* _MUTT_RFC3676_H */ +#endif /* MUTT_RFC3676_H */ diff --git a/sidebar.h b/sidebar.h index 159d13b41..cbbac200f 100644 --- a/sidebar.h +++ b/sidebar.h @@ -22,8 +22,8 @@ * this program. If not, see . */ -#ifndef _MUTT_SIDEBAR_H -#define _MUTT_SIDEBAR_H +#ifndef MUTT_SIDEBAR_H +#define MUTT_SIDEBAR_H #include @@ -50,4 +50,4 @@ void mutt_sb_set_mailbox_stats(const struct Context *ctx); void mutt_sb_set_open_mailbox(void); void mutt_sb_toggle_virtual(void); -#endif /* _MUTT_SIDEBAR_H */ +#endif /* MUTT_SIDEBAR_H */ diff --git a/sort.h b/sort.h index a59797d74..cd262d0b7 100644 --- a/sort.h +++ b/sort.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_SORT_H -#define _MUTT_SORT_H +#ifndef MUTT_SORT_H +#define MUTT_SORT_H #include #include "mutt/mutt.h" @@ -62,4 +62,4 @@ WHERE short SortAux; ///< Config: Secondary sort method for the index /* FIXME: This one does not belong to here */ WHERE short PgpSortKeys; ///< Config: Sort order for PGP keys -#endif /* _MUTT_SORT_H */ +#endif /* MUTT_SORT_H */ diff --git a/state.h b/state.h index bf578e29c..37de1be8d 100644 --- a/state.h +++ b/state.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_STATE_H -#define _MUTT_STATE_H +#ifndef MUTT_STATE_H +#define MUTT_STATE_H #include @@ -58,4 +58,4 @@ int state_printf(struct State *s, const char *fmt, ...); int state_putws(const wchar_t *ws, struct State *s); void state_prefix_put(const char *buf, size_t buflen, struct State *s); -#endif /* _MUTT_STATE_H */ +#endif /* MUTT_STATE_H */ diff --git a/terminal.h b/terminal.h index 7b9b58381..5b941158e 100644 --- a/terminal.h +++ b/terminal.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_TERMINAL_H -#define _MUTT_TERMINAL_H +#ifndef MUTT_TERMINAL_H +#define MUTT_TERMINAL_H #include @@ -31,4 +31,4 @@ bool mutt_ts_capability(void); void mutt_ts_status(char *str); void mutt_ts_icon(char *str); -#endif /* _MUTT_TERMINAL_H */ +#endif /* MUTT_TERMINAL_H */ diff --git a/version.h b/version.h index a7d05315c..ed1b36ae4 100644 --- a/version.h +++ b/version.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_VERSION_H -#define _MUTT_VERSION_H +#ifndef MUTT_VERSION_H +#define MUTT_VERSION_H #include @@ -29,4 +29,4 @@ void print_version(void); void print_copyright(void); bool feature_enabled(const char *name); -#endif /* _MUTT_VERSION_H */ +#endif /* MUTT_VERSION_H */ diff --git a/where.h b/where.h index 42ec8af46..a74da6758 100644 --- a/where.h +++ b/where.h @@ -20,8 +20,8 @@ * this program. If not, see . */ -#ifndef _MUTT_WHERE_H -#define _MUTT_WHERE_H +#ifndef MUTT_WHERE_H +#define MUTT_WHERE_H #ifdef MAIN_C #define WHERE @@ -31,4 +31,4 @@ #define INITVAL(x) #endif -#endif /* _MUTT_WHERE_H */ +#endif /* MUTT_WHERE_H */