Changed .h ifdef/defines to use <NAME>_H format.

src/lib-managesieve/managesieve-arg.h

@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_ARG_H
-#define __MANAGESIEVE_ARG_H
+#ifndef MANAGESIEVE_ARG_H
+#define MANAGESIEVE_ARG_H
 
 #include "array.h"
 

src/lib-managesieve/managesieve-parser.h

@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_PARSER_H
-#define __MANAGESIEVE_PARSER_H
+#ifndef MANAGESIEVE_PARSER_H
+#define MANAGESIEVE_PARSER_H
 
 #include "managesieve-arg.h"
 

src/lib-managesieve/managesieve-quote.h

@@ -1,5 +1,5 @@
-#ifndef __IMAP_QUOTE_H
-#define __IMAP_QUOTE_H
+#ifndef IMAP_QUOTE_H
+#define IMAP_QUOTE_H
 
 /* Return value suitable for sending to client, either as quoted-string or
    literal. Note that this also converts TABs into spaces, multiple spaces

src/lib-sieve-tool/mail-raw.h

@@ -1,5 +1,5 @@
-#ifndef __MAIL_RAW_H
-#define __MAIL_RAW_H
+#ifndef MAIL_RAW_H
+#define MAIL_RAW_H
 
 #include "lib.h"
 #include "master-service.h"
@@ -22,4 +22,4 @@ struct mail_raw *mail_raw_open_data
 void mail_raw_close(struct mail_raw **mailr);
 
 
-#endif /* __MAIL_RAW_H */
+#endif

src/lib-sieve-tool/sieve-tool.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_TOOL_H
-#define __SIEVE_TOOL_H
+#ifndef SIEVE_TOOL_H
+#define SIEVE_TOOL_H
 
 #include "sieve-common.h"
 
@@ -97,4 +97,4 @@ void sieve_tool_dump_binary_to
 void sieve_tool_parse_trace_option
 	(struct sieve_trace_config *tr_config, const char *tr_option);
 
-#endif /* __SIEVE_TOOL_H */
+#endif

src/lib-sieve/plugins/body/ext-body-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_BODY_COMMON_H
-#define __EXT_BODY_COMMON_H
+#ifndef EXT_BODY_COMMON_H
+#define EXT_BODY_COMMON_H
 
 /*
  * Types
@@ -37,4 +37,4 @@ int ext_body_get_part_list
 	(const struct sieve_runtime_env *renv, enum tst_body_transform transform,
 		const char * const *content_types, struct sieve_stringlist **strlist_r);
 
-#endif /* __EXT_BODY_COMMON_H */
+#endif

src/lib-sieve/plugins/copy/sieve-ext-copy.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_COPY_H
-#define __SIEVE_EXT_COPY_H
+#ifndef SIEVE_EXT_COPY_H
+#define SIEVE_EXT_COPY_H
 
 /* sieve_ext_copy_get_extension():
  *   Get the extension struct for the copy extension.
@@ -18,4 +18,4 @@ void sieve_ext_copy_register_tag
 	(struct sieve_validator *valdtr, const struct sieve_extension *copy_ext,
 		const char *command);
 
-#endif /* __SIEVE_EXT_COPY_H */
+#endif

src/lib-sieve/plugins/date/ext-date-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_DATE_COMMON_H
-#define __EXT_DATE_COMMON_H
+#ifndef EXT_DATE_COMMON_H
+#define EXT_DATE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -77,4 +77,4 @@ struct sieve_stringlist *ext_date_stringlist_create
 
 
 
-#endif /* __EXT_DATE_COMMON_H */
+#endif

src/lib-sieve/plugins/duplicate/ext-duplicate-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_DUPLICATE_COMMON_H
-#define __EXT_DUPLICATE_COMMON_H
+#ifndef EXT_DUPLICATE_COMMON_H
+#define EXT_DUPLICATE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -40,4 +40,4 @@ int ext_duplicate_check
 	(const struct sieve_runtime_env *renv, string_t *handle,
 		const char *value, size_t value_len, sieve_number_t period, bool last);
 
-#endif /* EXT_DUPLICATE_COMMON_H */
+#endif

src/lib-sieve/plugins/editheader/ext-editheader-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_EDITHEADER_COMMON_H
-#define __EXT_EDITHEADER_COMMON_H
+#ifndef EXT_EDITHEADER_COMMON_H
+#define EXT_EDITHEADER_COMMON_H
 
 /*
  * Commands
@@ -46,4 +46,4 @@ bool ext_editheader_header_allow_delete
 bool ext_editheader_header_too_large
 	(const struct sieve_extension *ext, size_t size);
 
-#endif /* __EXT_EDITHEADER_COMMON_H */
+#endif

src/lib-sieve/plugins/editheader/ext-editheader-limits.h

@@ -1,7 +1,7 @@
-#ifndef __EXT_EDITHEADER_LIMITS_H
-#define __EXT_EDITHEADER_LIMITS_H
+#ifndef EXT_EDITHEADER_LIMITS_H
+#define EXT_EDITHEADER_LIMITS_H
 
 #define EXT_EDITHEADER_MINIMUM_MAX_HEADER_SIZE  1024
 #define EXT_EDITHEADER_DEFAULT_MAX_HEADER_SIZE  2048
 
-#endif /* __EXT_EDITHEADER_LIMITS_H */
+#endif

src/lib-sieve/plugins/enotify/ext-enotify-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_ENOTIFY_COMMON_H
-#define __EXT_ENOTIFY_COMMON_H
+#ifndef EXT_ENOTIFY_COMMON_H
+#define EXT_ENOTIFY_COMMON_H
 
 #include "lib.h"
 #include "array.h"
@@ -120,4 +120,4 @@ struct sieve_enotify_print_env {
 	const struct sieve_result_print_env *result_penv;
 };
 
-#endif /* __EXT_ENOTIFY_COMMON_H */
+#endif

src/lib-sieve/plugins/enotify/ext-enotify-limits.h

@@ -1,6 +1,6 @@
-#ifndef __EXT_ENOTIFY_LIMITS_H
-#define __EXT_ENOTIFY_LIMITS_H
+#ifndef EXT_ENOTIFY_LIMITS_H
+#define EXT_ENOTIFY_LIMITS_H
 
 #define EXT_ENOTIFY_MAX_SCHEME_LEN  32
 
-#endif /* __EXT_ENOTIFY_LIMITS_H */
+#endif

src/lib-sieve/plugins/enotify/mailto/uri-mailto.h

@@ -1,5 +1,5 @@
-#ifndef __URI_MAILTO_H
-#define __URI_MAILTO_H
+#ifndef URI_MAILTO_H
+#define URI_MAILTO_H
 
 /*
  * Types
@@ -36,6 +36,6 @@ struct uri_mailto *uri_mailto_parse
 	const char **unique_headers, int max_recipients, int max_headers,
 	struct sieve_error_handler *ehandler);
 
-#endif /* __URI_MAILTO_H */
+#endif
 
 

src/lib-sieve/plugins/enotify/sieve-ext-enotify.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_ENOTIFY_H
-#define __SIEVE_EXT_ENOTIFY_H
+#ifndef SIEVE_EXT_ENOTIFY_H
+#define SIEVE_EXT_ENOTIFY_H
 
 #include "lib.h"
 #include "compat.h"
@@ -173,5 +173,5 @@ struct sieve_enotify_action {
 #define sieve_enotify_global_log_error(ENV, ...) \
 	sieve_global_info_error((ENV)->svinst, (ENV)->ehandler, NULL, __VA_ARGS__ )
 
-#endif /* __SIEVE_EXT_ENOTIFY_H */
+#endif
 

src/lib-sieve/plugins/environment/ext-environment-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_ENVIRONMENT_COMMON_H
-#define __EXT_ENVIRONMENT_COMMON_H
+#ifndef EXT_ENVIRONMENT_COMMON_H
+#define EXT_ENVIRONMENT_COMMON_H
 
 #include "lib.h"
 
@@ -50,4 +50,4 @@ void ext_environment_deinit(const struct sieve_extension *ext);
 void ext_environment_interpreter_init
 (const struct sieve_extension *this_ext, struct sieve_interpreter *interp);
 
-#endif /* __EXT_VARIABLES_COMMON_H */
+#endif

src/lib-sieve/plugins/environment/sieve-ext-environment.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_ENVIRONMENT_H
-#define __SIEVE_EXT_ENVIRONMENT_H
+#ifndef SIEVE_EXT_ENVIRONMENT_H
+#define SIEVE_EXT_ENVIRONMENT_H
 
 #include "sieve-common.h"
 

src/lib-sieve/plugins/ihave/ext-ihave-binary.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_IHAVE_BINARY_H
-#define __EXT_IHAVE_BINARY_H
+#ifndef EXT_IHAVE_BINARY_H
+#define EXT_IHAVE_BINARY_H
 
 /*
  * Binary context management
@@ -29,5 +29,5 @@ bool ext_ihave_binary_load
 bool ext_ihave_binary_dump
 	(const struct sieve_extension *ext, struct sieve_dumptime_env *denv);
 
-#endif /* __EXT_IHAVE_BINARY_H */
+#endif
 

src/lib-sieve/plugins/ihave/ext-ihave-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_IHAVE_COMMON_H
-#define __EXT_IHAVE_COMMON_H
+#ifndef EXT_IHAVE_COMMON_H
+#define EXT_IHAVE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -49,4 +49,4 @@ void ext_ihave_ast_add_missing_extension
 		const char *ext_name);
 
 
-#endif /* __EXT_IHAVE_COMMON_H */
+#endif

src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_IMAP4FLAGS_COMMON_H
-#define __EXT_IMAP4FLAGS_COMMON_H
+#ifndef EXT_IMAP4FLAGS_COMMON_H
+#define EXT_IMAP4FLAGS_COMMON_H
 
 #include "lib.h"
 
@@ -93,5 +93,5 @@ void ext_imap4flags_get_implicit_flags_init
 		struct sieve_result *result);
 
 
-#endif /* __EXT_IMAP4FLAGS_COMMON_H */
+#endif
 

src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_IMAP4FLAGS_H
-#define __SIEVE_EXT_IMAP4FLAGS_H
+#ifndef SIEVE_EXT_IMAP4FLAGS_H
+#define SIEVE_EXT_IMAP4FLAGS_H
 
 struct sieve_variable_storage;
 

src/lib-sieve/plugins/include/ext-include-binary.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_BINARY_H
-#define __EXT_INCLUDE_BINARY_H
+#ifndef EXT_INCLUDE_BINARY_H
+#define EXT_INCLUDE_BINARY_H
 
 #include "sieve-common.h"
 
@@ -60,5 +60,5 @@ bool ext_include_code_dump
 	(const struct sieve_extension *ext, const struct sieve_dumptime_env *denv,
 		sieve_size_t *address ATTR_UNUSED);
 
-#endif /* __EXT_INCLUDE_BINARY_H */
+#endif
 

src/lib-sieve/plugins/include/ext-include-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_COMMON_H
-#define __EXT_INCLUDE_COMMON_H
+#ifndef EXT_INCLUDE_COMMON_H
+#define EXT_INCLUDE_COMMON_H
 
 #include "lib.h"
 #include "hash.h"
@@ -166,4 +166,4 @@ void ext_include_execute_return(const struct sieve_runtime_env *renv);
 struct sieve_variable_storage *ext_include_interpreter_get_global_variables
 	(const struct sieve_extension *this_ext, struct sieve_interpreter *interp);
 
-#endif /* __EXT_INCLUDE_COMMON_H */
+#endif

src/lib-sieve/plugins/include/ext-include-limits.h

@@ -1,9 +1,9 @@
-#ifndef __EXT_INCLUDE_LIMITS_H
-#define __EXT_INCLUDE_LIMITS_H
+#ifndef EXT_INCLUDE_LIMITS_H
+#define EXT_INCLUDE_LIMITS_H
 
 #include "sieve-common.h"
 
 #define EXT_INCLUDE_DEFAULT_MAX_NESTING_DEPTH 10
 #define EXT_INCLUDE_DEFAULT_MAX_INCLUDES      255
 
-#endif /* __EXT_INCLUDE_LIMITS_H */
+#endif

src/lib-sieve/plugins/include/ext-include-variables.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_VARIABLES_H
-#define __EXT_INCLUDE_VARIABLES_H
+#ifndef EXT_INCLUDE_VARIABLES_H
+#define EXT_INCLUDE_VARIABLES_H
 
 #include "sieve-common.h"
 
@@ -37,5 +37,5 @@ bool ext_include_variables_dump
 void ext_include_variables_global_namespace_init
 	(const struct sieve_extension *this_ext, struct sieve_validator *valdtr);
 
-#endif /* __EXT_INCLUDE_VARIABLES_H */
+#endif
 

src/lib-sieve/plugins/index/ext-index-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_INDEX_COMMON_H
-#define __EXT_INDEX_COMMON_H
+#ifndef EXT_INDEX_COMMON_H
+#define EXT_INDEX_COMMON_H
 
 #include "sieve-common.h"
 
@@ -26,4 +26,4 @@ extern const struct sieve_operand_def index_operand;
 
 extern const struct sieve_extension_def index_extension;
 
-#endif /* __EXT_INDEX_COMMON_H */
+#endif

src/lib-sieve/plugins/mailbox/ext-mailbox-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_MAILBOX_COMMON_H
-#define __EXT_MAILBOX_COMMON_H
+#ifndef EXT_MAILBOX_COMMON_H
+#define EXT_MAILBOX_COMMON_H
 
 #include "sieve-common.h"
 
@@ -35,5 +35,5 @@ extern const struct sieve_operation_def mailboxexists_operation;
 
 extern const struct sieve_extension_def mailbox_extension;
 
-#endif /* __EXT_MAILBOX_COMMON_H */
+#endif
 

src/lib-sieve/plugins/mailbox/sieve-ext-mailbox.h

@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_MAILBOX_H
-#define __SIEVE_EXT_MAILBOX_H
+#ifndef SIEVE_EXT_MAILBOX_H
+#define SIEVE_EXT_MAILBOX_H
 
 /* sieve_ext_mailbox_get_extension():
  *   Get the extension struct for the mailbox extension.
@@ -18,4 +18,4 @@ void sieve_ext_mailbox_register_create_tag
 	(struct sieve_validator *valdtr, const struct sieve_extension *mailbox_ext,
 		const char *command);
 
-#endif /* __SIEVE_EXT_MAILBOX_H */
+#endif

src/lib-sieve/plugins/metadata/ext-metadata-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_METADATA_COMMON_H
-#define __EXT_METADATA_COMMON_H
+#ifndef EXT_METADATA_COMMON_H
+#define EXT_METADATA_COMMON_H
 
 #include "lib.h"
 #include "mail-storage.h"
@@ -37,4 +37,4 @@ extern const struct sieve_operation_def servermetadata_operation;
 extern const struct sieve_operation_def metadataexists_operation;
 extern const struct sieve_operation_def servermetadataexists_operation;
 
-#endif /* __EXT_METADATA_COMMON_H */
+#endif

src/lib-sieve/plugins/mime/ext-mime-common.h

@@ -1,5 +1,5 @@
-#ifndef __EXT_FOREVERYPART_COMMON_H
-#define __EXT_FOREVERYPART_COMMON_H
+#ifndef EXT_FOREVERYPART_COMMON_H
+#define EXT_FOREVERYPART_COMMON_H
 
 #include "sieve-message.h"
 
@@ -82,4 +82,4 @@ struct ext_foreverypart_runtime_loop *
 ext_foreverypart_runtime_loop_get_current
 (const struct sieve_runtime_env *renv);
 
-#endif /* __EXT_FOREVERYPART_COMMON_H */
+#endif