Mercurial > dovecot > core-2.2
changeset 6411:6a64e64fa3a3 HEAD
Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to ATTRS_DEFINED.
line wrap: on
line diff
--- a/src/auth/auth-cache.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/auth-cache.c Sun Sep 16 11:40:56 2007 +0300 @@ -90,7 +90,7 @@ i_free(node); } -static void sig_auth_cache_clear(int signo __attr_unused__, void *context) +static void sig_auth_cache_clear(int signo ATTR_UNUSED, void *context) { struct auth_cache *cache = context; @@ -98,7 +98,7 @@ auth_cache_clear(cache); } -static void sig_auth_cache_stats(int signo __attr_unused__, void *context) +static void sig_auth_cache_stats(int signo ATTR_UNUSED, void *context) { struct auth_cache *cache = context; unsigned int total_count;
--- a/src/auth/auth-request-handler.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/auth-request-handler.c Sun Sep 16 11:40:56 2007 +0300 @@ -499,7 +499,7 @@ buffer_set_used_size(auth_failures_buf, 0); } -static void auth_failure_timeout(void *context __attr_unused__) +static void auth_failure_timeout(void *context ATTR_UNUSED) { auth_request_handler_flush_failures(); }
--- a/src/auth/auth-request.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/auth-request.c Sun Sep 16 11:40:56 2007 +0300 @@ -1247,14 +1247,14 @@ static const char * escape_none(const char *string, - const struct auth_request *request __attr_unused__) + const struct auth_request *request ATTR_UNUSED) { return string; } const char * auth_request_str_escape(const char *string, - const struct auth_request *request __attr_unused__) + const struct auth_request *request ATTR_UNUSED) { return str_escape(string); } @@ -1320,7 +1320,7 @@ return tab; } -static const char * __attr_format__(3, 0) +static const char * ATTR_FORMAT(3, 0) get_log_str(struct auth_request *auth_request, const char *subsystem, const char *format, va_list va) {
--- a/src/auth/auth-request.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/auth-request.h Sun Sep 16 11:40:56 2007 +0300 @@ -157,13 +157,13 @@ void auth_request_log_debug(struct auth_request *auth_request, const char *subsystem, - const char *format, ...) __attr_format__(3, 4); + const char *format, ...) ATTR_FORMAT(3, 4); void auth_request_log_info(struct auth_request *auth_request, const char *subsystem, - const char *format, ...) __attr_format__(3, 4); + const char *format, ...) ATTR_FORMAT(3, 4); void auth_request_log_error(struct auth_request *auth_request, const char *subsystem, - const char *format, ...) __attr_format__(3, 4); + const char *format, ...) ATTR_FORMAT(3, 4); void auth_request_verify_plain_callback(enum passdb_result result, struct auth_request *request);
--- a/src/auth/auth-worker-server.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/auth-worker-server.c Sun Sep 16 11:40:56 2007 +0300 @@ -325,7 +325,7 @@ idle_count--; } -static void auth_worker_timeout(void *context __attr_unused__) +static void auth_worker_timeout(void *context ATTR_UNUSED) { struct auth_worker_connection **conn; size_t i, size;
--- a/src/auth/db-ldap.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/db-ldap.c Sun Sep 16 11:40:56 2007 +0300 @@ -404,7 +404,7 @@ #ifdef HAVE_LDAP_SASL static int -sasl_interact(LDAP *ld __attr_unused__, unsigned flags __attr_unused__, +sasl_interact(LDAP *ld ATTR_UNUSED, unsigned flags ATTR_UNUSED, void *defaults, void *interact) { struct ldap_sasl_bind_context *context = defaults; @@ -731,7 +731,7 @@ ((c) == '*' || (c) == '(' || (c) == ')' || (c) == '\\') const char *ldap_escape(const char *str, - const struct auth_request *auth_request __attr_unused__) + const struct auth_request *auth_request ATTR_UNUSED) { const char *p; string_t *ret;
--- a/src/auth/db-passwd-file.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/db-passwd-file.c Sun Sep 16 11:40:56 2007 +0300 @@ -371,7 +371,7 @@ static const char * path_fix(const char *path, - const struct auth_request *auth_request __attr_unused__) + const struct auth_request *auth_request ATTR_UNUSED) { const char *p;
--- a/src/auth/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -37,7 +37,7 @@ static struct auth *auth; static struct auth_worker_client *worker_client; -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -305,7 +305,7 @@ closelog(); } -int main(int argc __attr_unused__, char *argv[]) +int main(int argc ATTR_UNUSED, char *argv[]) { bool foreground = FALSE;
--- a/src/auth/mech-cram-md5.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/mech-cram-md5.c Sun Sep 16 11:40:56 2007 +0300 @@ -151,8 +151,8 @@ static void mech_cram_md5_auth_initial(struct auth_request *auth_request, - const unsigned char *data __attr_unused__, - size_t data_size __attr_unused__) + const unsigned char *data ATTR_UNUSED, + size_t data_size ATTR_UNUSED) { struct cram_auth_request *request = (struct cram_auth_request *)auth_request;
--- a/src/auth/mech-digest-md5.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/mech-digest-md5.c Sun Sep 16 11:40:56 2007 +0300 @@ -573,8 +573,8 @@ static void mech_digest_md5_auth_initial(struct auth_request *auth_request, - const unsigned char *data __attr_unused__, - size_t data_size __attr_unused__) + const unsigned char *data ATTR_UNUSED, + size_t data_size ATTR_UNUSED) { struct digest_auth_request *request = (struct digest_auth_request *)auth_request;
--- a/src/auth/mech-winbind.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/mech-winbind.c Sun Sep 16 11:40:56 2007 +0300 @@ -87,8 +87,8 @@ winbind->pid = -1; } -static void sigchld_handler(int signo __attr_unused__, - void *context __attr_unused__) +static void sigchld_handler(int signo ATTR_UNUSED, + void *context ATTR_UNUSED) { winbind_wait_pid(&winbind_ntlm_context); winbind_wait_pid(&winbind_spnego_context);
--- a/src/auth/passdb-bsdauth.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-bsdauth.c Sun Sep 16 11:40:56 2007 +0300 @@ -62,7 +62,7 @@ return module; } -static void bsdauth_deinit(struct passdb_module *module __attr_unused__) +static void bsdauth_deinit(struct passdb_module *module ATTR_UNUSED) { endpwent(); }
--- a/src/auth/passdb-checkpassword.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-checkpassword.c Sun Sep 16 11:40:56 2007 +0300 @@ -142,7 +142,7 @@ } } -static void sigchld_handler(int signo __attr_unused__, void *context) +static void sigchld_handler(int signo ATTR_UNUSED, void *context) { struct checkpassword_passdb_module *module = context; struct chkpw_auth_request *request; @@ -210,7 +210,7 @@ } } -static void __attr_noreturn__ +static void ATTR_NORETURN checkpassword_verify_plain_child(struct auth_request *request, struct checkpassword_passdb_module *module, int fd_in, int fd_out) @@ -436,7 +436,7 @@ } static void checkpassword_init(struct passdb_module *module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { lib_signals_set_handler(SIGCHLD, TRUE, sigchld_handler, module); }
--- a/src/auth/passdb-ldap.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-ldap.c Sun Sep 16 11:40:56 2007 +0300 @@ -380,7 +380,7 @@ static void ldap_verify_plain(struct auth_request *request, - const char *password __attr_unused__, + const char *password ATTR_UNUSED, verify_plain_callback_t *callback) { struct passdb_module *_module = request->passdb->passdb; @@ -443,7 +443,7 @@ } static void passdb_ldap_init(struct passdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct ldap_passdb_module *module = (struct ldap_passdb_module *)_module;
--- a/src/auth/passdb-passwd-file.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-passwd-file.c Sun Sep 16 11:40:56 2007 +0300 @@ -164,7 +164,7 @@ } static void passwd_file_init(struct passdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct passwd_file_passdb_module *module = (struct passwd_file_passdb_module *)_module;
--- a/src/auth/passdb-passwd.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-passwd.c Sun Sep 16 11:40:56 2007 +0300 @@ -66,7 +66,7 @@ module->default_pass_scheme = PASSWD_PASS_SCHEME; } -static void passwd_deinit(struct passdb_module *module __attr_unused__) +static void passwd_deinit(struct passdb_module *module ATTR_UNUSED) { endpwent(); }
--- a/src/auth/passdb-shadow.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-shadow.c Sun Sep 16 11:40:56 2007 +0300 @@ -66,7 +66,7 @@ module->default_pass_scheme = SHADOW_PASS_SCHEME; } -static void shadow_deinit(struct passdb_module *module __attr_unused__) +static void shadow_deinit(struct passdb_module *module ATTR_UNUSED) { endspent(); }
--- a/src/auth/passdb-sia.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-sia.c Sun Sep 16 11:40:56 2007 +0300 @@ -13,10 +13,10 @@ #include <siad.h> #include <sys/security.h> -static int checkpw_collect(int timeout __attr_unused__, int rendition, - uchar_t *title __attr_unused__, - int nprompts __attr_unused__, - prompt_t *prompts __attr_unused__) +static int checkpw_collect(int timeout ATTR_UNUSED, int rendition, + uchar_t *title ATTR_UNUSED, + int nprompts ATTR_UNUSED, + prompt_t *prompts ATTR_UNUSED) { switch (rendition) { case SIAONELINER:
--- a/src/auth/passdb-sql.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-sql.c Sun Sep 16 11:40:56 2007 +0300 @@ -158,7 +158,7 @@ } static void sql_verify_plain(struct auth_request *request, - const char *password __attr_unused__, + const char *password ATTR_UNUSED, verify_plain_callback_t *callback) { struct passdb_sql_request *sql_request; @@ -245,7 +245,7 @@ } static void passdb_sql_init(struct passdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct sql_passdb_module *module = (struct sql_passdb_module *)_module;
--- a/src/auth/passdb-vpopmail.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/passdb-vpopmail.c Sun Sep 16 11:40:56 2007 +0300 @@ -142,7 +142,7 @@ return module; } -static void vpopmail_deinit(struct passdb_module *module __attr_unused__) +static void vpopmail_deinit(struct passdb_module *module ATTR_UNUSED) { vclose(); }
--- a/src/auth/password-scheme.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/password-scheme.c Sun Sep 16 11:40:56 2007 +0300 @@ -248,7 +248,7 @@ } static bool -crypt_verify(const char *plaintext, const char *user __attr_unused__, +crypt_verify(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char *raw_password, size_t size) { const char *password; @@ -263,7 +263,7 @@ } static void -crypt_generate(const char *plaintext, const char *user __attr_unused__, +crypt_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { char salt[3]; @@ -280,7 +280,7 @@ } static bool -md5_crypt_verify(const char *plaintext, const char *user __attr_unused__, +md5_crypt_verify(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char *raw_password, size_t size) { const char *password, *str; @@ -291,7 +291,7 @@ } static void -md5_crypt_generate(const char *plaintext, const char *user __attr_unused__, +md5_crypt_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { const char *password; @@ -309,7 +309,7 @@ } static void -sha1_generate(const char *plaintext, const char *user __attr_unused__, +sha1_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -322,7 +322,7 @@ } static void -sha256_generate(const char *plaintext, const char *user __attr_unused__, +sha256_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -335,7 +335,7 @@ } static void -ssha_generate(const char *plaintext, const char *user __attr_unused__, +ssha_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { #define SSHA_SALT_LEN 4 @@ -375,7 +375,7 @@ } static void -smd5_generate(const char *plaintext, const char *user __attr_unused__, +smd5_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { #define SMD5_SALT_LEN 4 @@ -415,7 +415,7 @@ } static void -plain_generate(const char *plaintext, const char *user __attr_unused__, +plain_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { *raw_password_r = (const unsigned char *)plaintext, @@ -423,7 +423,7 @@ } static void -cram_md5_generate(const char *plaintext, const char *user __attr_unused__, +cram_md5_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { struct hmac_md5_context ctx; @@ -462,7 +462,7 @@ } static void -plain_md4_generate(const char *plaintext, const char *user __attr_unused__, +plain_md4_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -475,7 +475,7 @@ } static void -plain_md5_generate(const char *plaintext, const char *user __attr_unused__, +plain_md5_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -488,7 +488,7 @@ } static void -lm_generate(const char *plaintext, const char *user __attr_unused__, +lm_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -501,7 +501,7 @@ } static void -ntlm_generate(const char *plaintext, const char *user __attr_unused__, +ntlm_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest; @@ -513,7 +513,7 @@ *size_r = NTLMSSP_HASH_SIZE; } -static bool otp_verify(const char *plaintext, const char *user __attr_unused__, +static bool otp_verify(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char *raw_password, size_t size) { const char *password; @@ -524,7 +524,7 @@ } static void -otp_generate(const char *plaintext, const char *user __attr_unused__, +otp_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { const char *password; @@ -535,7 +535,7 @@ } static void -skey_generate(const char *plaintext, const char *user __attr_unused__, +skey_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { const char *password; @@ -546,7 +546,7 @@ } static void -rpa_generate(const char *plaintext, const char *user __attr_unused__, +rpa_generate(const char *plaintext, const char *user ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r) { unsigned char *digest;
--- a/src/auth/userdb-ldap.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/userdb-ldap.c Sun Sep 16 11:40:56 2007 +0300 @@ -145,7 +145,7 @@ } static void userdb_ldap_init(struct userdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct ldap_userdb_module *module = (struct ldap_userdb_module *)_module;
--- a/src/auth/userdb-passwd-file.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/userdb-passwd-file.c Sun Sep 16 11:40:56 2007 +0300 @@ -114,7 +114,7 @@ } static void passwd_file_init(struct userdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct passwd_file_userdb_module *module = (struct passwd_file_userdb_module *)_module;
--- a/src/auth/userdb-sql.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/userdb-sql.c Sun Sep 16 11:40:56 2007 +0300 @@ -121,7 +121,7 @@ } static void userdb_sql_init(struct userdb_module *_module, - const char *args __attr_unused__) + const char *args ATTR_UNUSED) { struct sql_userdb_module *module = (struct sql_userdb_module *)_module;
--- a/src/auth/userdb-static.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/auth/userdb-static.c Sun Sep 16 11:40:56 2007 +0300 @@ -154,8 +154,8 @@ static void static_credentials_callback(enum passdb_result result, - const unsigned char *credentials __attr_unused__, - size_t size __attr_unused__, + const unsigned char *credentials ATTR_UNUSED, + size_t size ATTR_UNUSED, struct auth_request *auth_request) { struct static_context *ctx = auth_request->context;
--- a/src/deliver/deliver.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/deliver/deliver.c Sun Sep 16 11:40:56 2007 +0300 @@ -60,7 +60,7 @@ static pool_t plugin_pool; static ARRAY_DEFINE(plugin_envs, const char *); -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */
--- a/src/deliver/smtp-client.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/deliver/smtp-client.c Sun Sep 16 11:40:56 2007 +0300 @@ -24,7 +24,7 @@ return client; } -static void __attr_noreturn__ +static void ATTR_NORETURN smtp_client_run_sendmail(const char *destination, const char *return_path, int fd) {
--- a/src/dict/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/dict/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -24,7 +24,7 @@ static struct module *modules; static struct dict_server *dict_server; -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -33,7 +33,7 @@ io_loop_stop(ioloop); } -static void log_error_callback(void *context __attr_unused__) +static void log_error_callback(void *context ATTR_UNUSED) { io_loop_stop(ioloop); }
--- a/src/imap-login/client.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap-login/client.c Sun Sep 16 11:40:56 2007 +0300 @@ -579,7 +579,7 @@ } } -static void idle_timeout(void *context __attr_unused__) +static void idle_timeout(void *context ATTR_UNUSED) { struct hash_iterate_context *iter; void *key, *value;
--- a/src/imap/client.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap/client.c Sun Sep 16 11:40:56 2007 +0300 @@ -693,7 +693,7 @@ return ret; } -static void idle_timeout(void *context __attr_unused__) +static void idle_timeout(void *context ATTR_UNUSED) { time_t idle_time, last_change;
--- a/src/imap/imap-fetch-body.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap/imap-fetch-body.c Sun Sep 16 11:40:56 2007 +0300 @@ -356,7 +356,7 @@ } static void header_filter_eoh(struct message_header_line *hdr, - bool *matched __attr_unused__, + bool *matched ATTR_UNUSED, struct imap_fetch_context *ctx) { if (hdr != NULL && hdr->eoh) @@ -852,7 +852,7 @@ } static int fetch_rfc822_size(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { uoff_t size; @@ -864,7 +864,7 @@ } static int fetch_rfc822(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { struct message_size hdr_size, body_size; const char *str; @@ -892,7 +892,7 @@ } static int fetch_rfc822_header(struct imap_fetch_context *ctx, - struct mail *mail, void *context __attr_unused__) + struct mail *mail, void *context ATTR_UNUSED) { struct message_size hdr_size; const char *str; @@ -916,7 +916,7 @@ } static int fetch_rfc822_text(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { struct message_size hdr_size, body_size; const char *str; @@ -941,7 +941,7 @@ } bool fetch_rfc822_init(struct imap_fetch_context *ctx, const char *name, - const struct imap_arg **args __attr_unused__) + const struct imap_arg **args ATTR_UNUSED) { if (name[6] == '\0') { ctx->fetch_data |= MAIL_FETCH_STREAM_HEADER |
--- a/src/imap/imap-fetch.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap/imap-fetch.c Sun Sep 16 11:40:56 2007 +0300 @@ -399,7 +399,7 @@ } static int fetch_body(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { const char *body; @@ -433,7 +433,7 @@ } static int fetch_bodystructure(struct imap_fetch_context *ctx, - struct mail *mail, void *context __attr_unused__) + struct mail *mail, void *context ATTR_UNUSED) { const char *bodystructure; @@ -458,7 +458,7 @@ static bool fetch_bodystructure_init(struct imap_fetch_context *ctx, const char *name, - const struct imap_arg **args __attr_unused__) + const struct imap_arg **args ATTR_UNUSED) { ctx->fetch_data |= MAIL_FETCH_IMAP_BODYSTRUCTURE; imap_fetch_add_handler(ctx, FALSE, FALSE, name, @@ -468,7 +468,7 @@ } static int fetch_envelope(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { const char *envelope; @@ -491,7 +491,7 @@ static bool fetch_envelope_init(struct imap_fetch_context *ctx, const char *name, - const struct imap_arg **args __attr_unused__) + const struct imap_arg **args ATTR_UNUSED) { ctx->fetch_data |= MAIL_FETCH_IMAP_ENVELOPE; imap_fetch_add_handler(ctx, FALSE, FALSE, name, @@ -501,7 +501,7 @@ } static int fetch_flags(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { enum mail_flags flags; const char *const *keywords; @@ -525,7 +525,7 @@ static bool fetch_flags_init(struct imap_fetch_context *ctx, const char *name, - const struct imap_arg **args __attr_unused__) + const struct imap_arg **args ATTR_UNUSED) { ctx->flags_have_handler = TRUE; ctx->fetch_data |= MAIL_FETCH_FLAGS; @@ -534,7 +534,7 @@ } static int fetch_internaldate(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { time_t date; @@ -548,7 +548,7 @@ static bool fetch_internaldate_init(struct imap_fetch_context *ctx, const char *name, - const struct imap_arg **args __attr_unused__) + const struct imap_arg **args ATTR_UNUSED) { ctx->fetch_data |= MAIL_FETCH_RECEIVED_DATE; imap_fetch_add_handler(ctx, TRUE, FALSE, name, @@ -558,15 +558,15 @@ } static int fetch_uid(struct imap_fetch_context *ctx, struct mail *mail, - void *context __attr_unused__) + void *context ATTR_UNUSED) { str_printfa(ctx->cur_str, "UID %u ", mail->uid); return 1; } static bool -fetch_uid_init(struct imap_fetch_context *ctx __attr_unused__, const char *name, - const struct imap_arg **args __attr_unused__) +fetch_uid_init(struct imap_fetch_context *ctx ATTR_UNUSED, const char *name, + const struct imap_arg **args ATTR_UNUSED) { imap_fetch_add_handler(ctx, TRUE, FALSE, name, NULL, fetch_uid, NULL); return TRUE;
--- a/src/imap/mail-storage-callbacks.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap/mail-storage-callbacks.c Sun Sep 16 11:40:56 2007 +0300 @@ -5,7 +5,7 @@ #include "mail-storage.h" #include "commands-util.h" -static void notify_ok(struct mailbox *mailbox __attr_unused__, +static void notify_ok(struct mailbox *mailbox ATTR_UNUSED, const char *text, void *context) { struct client *client = context; @@ -21,7 +21,7 @@ t_pop(); } -static void notify_no(struct mailbox *mailbox __attr_unused__, +static void notify_no(struct mailbox *mailbox ATTR_UNUSED, const char *text, void *context) { struct client *client = context;
--- a/src/imap/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/imap/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -52,7 +52,7 @@ string_t *capability_string; -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -61,7 +61,7 @@ io_loop_stop(ioloop); } -static void log_error_callback(void *context __attr_unused__) +static void log_error_callback(void *context ATTR_UNUSED) { io_loop_stop(ioloop); } @@ -268,7 +268,7 @@ closelog(); } -int main(int argc __attr_unused__, char *argv[], char *envp[]) +int main(int argc ATTR_UNUSED, char *argv[], char *envp[]) { #ifdef DEBUG if (getenv("LOGGED_IN") != NULL && getenv("GDB") == NULL)
--- a/src/lib-charset/charset-utf8.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-charset/charset-utf8.c Sun Sep 16 11:40:56 2007 +0300 @@ -41,11 +41,11 @@ return -1; } -void charset_to_utf8_end(struct charset_translation **t __attr_unused__) +void charset_to_utf8_end(struct charset_translation **t ATTR_UNUSED) { } -void charset_to_utf8_reset(struct charset_translation *t __attr_unused__) +void charset_to_utf8_reset(struct charset_translation *t ATTR_UNUSED) { }
--- a/src/lib-dict/dict-db.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-dict/dict-db.c Sun Sep 16 11:40:56 2007 +0300 @@ -41,8 +41,8 @@ static void db_dict_deinit(struct dict *_dict); -static int associate_key(DB *pdb __attr_unused__, - const DBT *pkey __attr_unused__, +static int associate_key(DB *pdb ATTR_UNUSED, + const DBT *pkey ATTR_UNUSED, const DBT *pdata, DBT *skey) { memset(skey, 0, sizeof(*skey)); @@ -51,7 +51,7 @@ return 0; } -static int uint32_t_compare(DB *db __attr_unused__, +static int uint32_t_compare(DB *db ATTR_UNUSED, const DBT *keya, const DBT *keyb) { const uint32_t *ua = keya->data, *ub = keyb->data; @@ -62,7 +62,7 @@ static struct dict *db_dict_init(struct dict *driver, const char *uri, enum dict_data_type value_type, - const char *username __attr_unused__) + const char *username ATTR_UNUSED) { struct db_dict *dict; const char *hdir;
--- a/src/lib-dict/dict-sql.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-dict/dict-sql.c Sun Sep 16 11:40:56 2007 +0300 @@ -103,7 +103,7 @@ static struct dict * sql_dict_init(struct dict *driver, const char *uri, - enum dict_data_type value_type __attr_unused__, + enum dict_data_type value_type ATTR_UNUSED, const char *username) { struct sql_dict *dict;
--- a/src/lib-imap/imap-parser.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-imap/imap-parser.c Sun Sep 16 11:40:56 2007 +0300 @@ -627,7 +627,7 @@ char *_imap_arg_str_error(const struct imap_arg *arg) { i_panic("Tried to access imap_arg type %d as string", arg->type); -#ifndef __attrs_used__ +#ifndef ATTRS_DEFINED return NULL; #endif } @@ -635,7 +635,7 @@ uoff_t _imap_arg_literal_size_error(const struct imap_arg *arg) { i_panic("Tried to access imap_arg type %d as literal size", arg->type); -#ifndef __attrs_used__ +#ifndef ATTRS_DEFINED return 0; #endif } @@ -643,7 +643,7 @@ ARRAY_TYPE(imap_arg_list) *_imap_arg_list_error(const struct imap_arg *arg) { i_panic("Tried to access imap_arg type %d as list", arg->type); -#ifndef __attrs_used__ +#ifndef ATTRS_DEFINED return NULL; #endif }
--- a/src/lib-imap/imap-parser.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-imap/imap-parser.h Sun Sep 16 11:40:56 2007 +0300 @@ -134,10 +134,10 @@ const char *imap_arg_string(const struct imap_arg *arg); /* Error functions */ -char *_imap_arg_str_error(const struct imap_arg *arg) __attr_noreturn__; +char *_imap_arg_str_error(const struct imap_arg *arg) ATTR_NORETURN; uoff_t _imap_arg_literal_size_error(const struct imap_arg *arg) - __attr_noreturn__; + ATTR_NORETURN; ARRAY_TYPE(imap_arg_list) *_imap_arg_list_error(const struct imap_arg *arg) - __attr_noreturn__; + ATTR_NORETURN; #endif
--- a/src/lib-index/mail-cache-sync-update.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-cache-sync-update.c Sun Sep 16 11:40:56 2007 +0300 @@ -60,7 +60,7 @@ } int mail_cache_expunge_handler(struct mail_index_sync_map_ctx *sync_ctx, - uint32_t seq __attr_unused__, const void *data, + uint32_t seq ATTR_UNUSED, const void *data, void **sync_context, void *context) { struct mail_cache *cache = context; @@ -96,7 +96,7 @@ } int mail_cache_sync_handler(struct mail_index_sync_map_ctx *sync_ctx, - uint32_t seq __attr_unused__, + uint32_t seq ATTR_UNUSED, void *old_data, const void *new_data, void **context) {
--- a/src/lib-index/mail-cache.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-cache.h Sun Sep 16 11:40:56 2007 +0300 @@ -105,6 +105,6 @@ /* "Error in index cache file %s: ...". */ void mail_cache_set_corrupted(struct mail_cache *cache, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); #endif
--- a/src/lib-index/mail-index-dummy-view.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-index-dummy-view.c Sun Sep 16 11:40:56 2007 +0300 @@ -5,7 +5,7 @@ #include "mail-index-private.h" #include "mail-index-view-private.h" -static void _dummy_view_close(struct mail_index_view *view __attr_unused__) +static void _dummy_view_close(struct mail_index_view *view ATTR_UNUSED) { i_assert(view->refcount == 0); @@ -14,7 +14,7 @@ } static uint32_t -_dummy_view_get_message_count(struct mail_index_view *view __attr_unused__) +_dummy_view_get_message_count(struct mail_index_view *view ATTR_UNUSED) { return (uint32_t)-3; }
--- a/src/lib-index/mail-index-fsck.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-index-fsck.c Sun Sep 16 11:40:56 2007 +0300 @@ -7,7 +7,7 @@ #include "mail-transaction-log.h" static void mail_index_fsck_error(struct mail_index *index, - const char *fmt, ...) __attr_format__(2, 3); + const char *fmt, ...) ATTR_FORMAT(2, 3); static void mail_index_fsck_error(struct mail_index *index, const char *fmt, ...) {
--- a/src/lib-index/mail-index-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-index-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -305,7 +305,7 @@ void mail_index_fsck_locked(struct mail_index *index); int mail_index_set_error(struct mail_index *index, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); /* "%s failed with index file %s: %m" */ int mail_index_set_syscall_error(struct mail_index *index, const char *function);
--- a/src/lib-index/mail-index-sync-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-index-sync-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -87,7 +87,7 @@ const struct mail_transaction_keyword_reset *r); void mail_index_sync_set_corrupted(struct mail_index_sync_map_ctx *ctx, - const char *fmt, ...) __attr_format__(2, 3); + const char *fmt, ...) ATTR_FORMAT(2, 3); #ifdef DEBUG void mail_index_map_check(struct mail_index_map *map);
--- a/src/lib-index/mail-index-view.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-index-view.c Sun Sep 16 11:40:56 2007 +0300 @@ -383,7 +383,7 @@ *data_size_r = ext->hdr_size; } -static bool _view_ext_get_reset_id(struct mail_index_view *view __attr_unused__, +static bool _view_ext_get_reset_id(struct mail_index_view *view ATTR_UNUSED, struct mail_index_map *map, uint32_t ext_id, uint32_t *reset_id_r) { @@ -562,7 +562,7 @@ return view->v.ext_get_reset_id(view, map, ext_id, reset_id_r); } -void mail_index_ext_get_size(struct mail_index_view *view __attr_unused__, +void mail_index_ext_get_size(struct mail_index_view *view ATTR_UNUSED, uint32_t ext_id, struct mail_index_map *map, uint32_t *hdr_size_r, uint16_t *record_size_r, uint16_t *record_align_r)
--- a/src/lib-index/mail-transaction-log-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-transaction-log-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -77,7 +77,7 @@ void mail_transaction_log_file_set_corrupted(struct mail_transaction_log_file *file, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); struct mail_transaction_log_file * mail_transaction_log_file_alloc_in_memory(struct mail_transaction_log *log);
--- a/src/lib-index/mail-transaction-log.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-index/mail-transaction-log.h Sun Sep 16 11:40:56 2007 +0300 @@ -178,7 +178,7 @@ void mail_transaction_log_view_set_corrupted(struct mail_transaction_log_view *view, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); bool mail_transaction_log_view_is_corrupted(struct mail_transaction_log_view *view);
--- a/src/lib-mail/istream-header-filter.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-mail/istream-header-filter.c Sun Sep 16 11:40:56 2007 +0300 @@ -37,7 +37,7 @@ header_filter_callback *null_header_filter_callback = NULL; -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { } @@ -264,7 +264,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { struct header_filter_istream *mstream = (struct header_filter_istream *)stream; @@ -294,8 +294,8 @@ } } -static void __attr_noreturn__ -_sync(struct _istream *stream __attr_unused__) +static void ATTR_NORETURN +_sync(struct _istream *stream ATTR_UNUSED) { i_panic("istream-header-filter sync() not implemented"); }
--- a/src/lib-mail/message-parser.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-mail/message-parser.c Sun Sep 16 11:40:56 2007 +0300 @@ -543,8 +543,8 @@ return parse_next_header(ctx, block_r); } -static int preparsed_parse_eof(struct message_parser_ctx *ctx __attr_unused__, - struct message_block *block_r __attr_unused__) +static int preparsed_parse_eof(struct message_parser_ctx *ctx ATTR_UNUSED, + struct message_block *block_r ATTR_UNUSED) { return -1; }
--- a/src/lib-sql/driver-mysql.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-sql/driver-mysql.c Sun Sep 16 11:40:56 2007 +0300 @@ -272,7 +272,7 @@ } static enum sql_db_flags -driver_mysql_get_flags(struct sql_db *db __attr_unused__) +driver_mysql_get_flags(struct sql_db *db ATTR_UNUSED) { return SQL_DB_FLAG_BLOCKING; } @@ -690,7 +690,7 @@ }; static int -driver_mysql_result_error_next_row(struct sql_result *result __attr_unused__) +driver_mysql_result_error_next_row(struct sql_result *result ATTR_UNUSED) { return -1; }
--- a/src/lib-sql/driver-pgsql.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-sql/driver-pgsql.c Sun Sep 16 11:40:56 2007 +0300 @@ -217,7 +217,7 @@ } static enum sql_db_flags -driver_pgsql_get_flags(struct sql_db *db __attr_unused__) +driver_pgsql_get_flags(struct sql_db *db ATTR_UNUSED) { return 0; } @@ -482,7 +482,7 @@ } static void exec_callback(struct sql_result *result, - void *context __attr_unused__) + void *context ATTR_UNUSED) { struct pgsql_db *db = (struct pgsql_db *)result->db;
--- a/src/lib-sql/driver-sqlite.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-sql/driver-sqlite.c Sun Sep 16 11:40:56 2007 +0300 @@ -83,13 +83,13 @@ } static enum sql_db_flags -driver_sqlite_get_flags(struct sql_db *db __attr_unused__) +driver_sqlite_get_flags(struct sql_db *db ATTR_UNUSED) { return SQL_DB_FLAG_BLOCKING; } static const char * -driver_sqlite_escape_string(struct sql_db *_db __attr_unused__, +driver_sqlite_escape_string(struct sql_db *_db ATTR_UNUSED, const char *string) { const char *p; @@ -406,7 +406,7 @@ }; static int -driver_sqlite_result_error_next_row(struct sql_result *result __attr_unused__) +driver_sqlite_result_error_next_row(struct sql_result *result ATTR_UNUSED) { return -1; }
--- a/src/lib-sql/sql-api.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-sql/sql-api.c Sun Sep 16 11:40:56 2007 +0300 @@ -38,7 +38,7 @@ } struct sql_db *sql_init(const char *db_driver, - const char *connect_string __attr_unused__) + const char *connect_string ATTR_UNUSED) { const struct sql_db *const *drivers; unsigned int i, count; @@ -259,18 +259,18 @@ } static void -sql_result_not_connected_free(struct sql_result *result __attr_unused__) +sql_result_not_connected_free(struct sql_result *result ATTR_UNUSED) { } static int -sql_result_not_connected_next_row(struct sql_result *result __attr_unused__) +sql_result_not_connected_next_row(struct sql_result *result ATTR_UNUSED) { return -1; } static const char * -sql_result_not_connected_get_error(struct sql_result *result __attr_unused__) +sql_result_not_connected_get_error(struct sql_result *result ATTR_UNUSED) { return "Not connected to database"; }
--- a/src/lib-storage/index/cydir/cydir-save.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/cydir/cydir-save.c Sun Sep 16 11:40:56 2007 +0300 @@ -59,8 +59,8 @@ int cydir_save_init(struct mailbox_transaction_context *_t, enum mail_flags flags, struct mail_keywords *keywords, - time_t received_date, int timezone_offset __attr_unused__, - const char *from_envelope __attr_unused__, + time_t received_date, int timezone_offset ATTR_UNUSED, + const char *from_envelope ATTR_UNUSED, struct istream *input, struct mail *dest_mail, struct mail_save_context **ctx_r) {
--- a/src/lib-storage/index/cydir/cydir-storage.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/cydir/cydir-storage.c Sun Sep 16 11:40:56 2007 +0300 @@ -225,7 +225,7 @@ static int cydir_mailbox_create(struct mail_storage *_storage, const char *name, - bool directory __attr_unused__) + bool directory ATTR_UNUSED) { const char *path; struct stat st; @@ -350,7 +350,7 @@ } static int cydir_list_iter_is_mailbox(struct mailbox_list_iterate_context *ctx - __attr_unused__, + ATTR_UNUSED, const char *dir, const char *fname, enum mailbox_list_file_type type, enum mailbox_info_flags *flags)
--- a/src/lib-storage/index/dbox/dbox-save.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/dbox/dbox-save.c Sun Sep 16 11:40:56 2007 +0300 @@ -62,8 +62,8 @@ int dbox_save_init(struct mailbox_transaction_context *_t, enum mail_flags flags, struct mail_keywords *keywords, - time_t received_date, int timezone_offset __attr_unused__, - const char *from_envelope __attr_unused__, + time_t received_date, int timezone_offset ATTR_UNUSED, + const char *from_envelope ATTR_UNUSED, struct istream *input, struct mail *dest_mail, struct mail_save_context **ctx_r) {
--- a/src/lib-storage/index/dbox/dbox-storage.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/dbox/dbox-storage.c Sun Sep 16 11:40:56 2007 +0300 @@ -275,7 +275,7 @@ } static int dbox_mailbox_create(struct mail_storage *_storage, - const char *name, bool directory __attr_unused__) + const char *name, bool directory ATTR_UNUSED) { const char *path; struct stat st; @@ -400,7 +400,7 @@ } static int dbox_list_iter_is_mailbox(struct mailbox_list_iterate_context *ctx - __attr_unused__, + ATTR_UNUSED, const char *dir, const char *fname, enum mailbox_list_file_type type, enum mailbox_info_flags *flags)
--- a/src/lib-storage/index/index-search.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/index-search.c Sun Sep 16 11:40:56 2007 +0300 @@ -401,7 +401,7 @@ } static void search_header_unmatch(struct mail_search_arg *arg, - void *context __attr_unused__) + void *context ATTR_UNUSED) { switch (arg->type) { case SEARCH_SENTBEFORE: @@ -842,7 +842,7 @@ } static void search_arg_deinit(struct mail_search_arg *arg, - void *context __attr_unused__) + void *context ATTR_UNUSED) { struct message_search_context *search_ctx = arg->context;
--- a/src/lib-storage/index/index-storage.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/index-storage.c Sun Sep 16 11:40:56 2007 +0300 @@ -205,7 +205,7 @@ timeout_remove(&to_index); } -static void index_removal_timeout(void *context __attr_unused__) +static void index_removal_timeout(void *context ATTR_UNUSED) { destroy_unrefed(FALSE); }
--- a/src/lib-storage/index/maildir/maildir-save.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/maildir/maildir-save.c Sun Sep 16 11:40:56 2007 +0300 @@ -345,8 +345,8 @@ int maildir_save_init(struct mailbox_transaction_context *_t, enum mail_flags flags, struct mail_keywords *keywords, - time_t received_date, int timezone_offset __attr_unused__, - const char *from_envelope __attr_unused__, + time_t received_date, int timezone_offset ATTR_UNUSED, + const char *from_envelope ATTR_UNUSED, struct istream *input, struct mail *dest_mail, struct mail_save_context **ctx_r) {
--- a/src/lib-storage/index/maildir/maildir-storage.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/maildir/maildir-storage.c Sun Sep 16 11:40:56 2007 +0300 @@ -49,7 +49,7 @@ const char *oldname, const char *newname); static int maildir_list_iter_is_mailbox(struct mailbox_list_iterate_context *ctx - __attr_unused__, + ATTR_UNUSED, const char *dir, const char *fname, enum mailbox_list_file_type type, enum mailbox_info_flags *flags_r); @@ -592,7 +592,7 @@ static int maildir_mailbox_create(struct mail_storage *_storage, const char *name, - bool directory __attr_unused__) + bool directory ATTR_UNUSED) { struct stat st; const char *path, *root_dir, *shared_path; @@ -874,7 +874,7 @@ static int maildir_list_iter_is_mailbox(struct mailbox_list_iterate_context *ctx - __attr_unused__, + ATTR_UNUSED, const char *dir, const char *fname, enum mailbox_list_file_type type, enum mailbox_info_flags *flags_r)
--- a/src/lib-storage/index/maildir/maildir-util.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/maildir/maildir-util.c Sun Sep 16 11:40:56 2007 +0300 @@ -42,7 +42,7 @@ } static int do_racecheck(struct maildir_mailbox *mbox, const char *path, - void *context __attr_unused__) + void *context ATTR_UNUSED) { struct stat st;
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/mbox/istream-raw-mbox.c Sun Sep 16 11:40:56 2007 +0300 @@ -22,7 +22,7 @@ unsigned int eof:1; }; -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { } @@ -307,7 +307,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
--- a/src/lib-storage/index/mbox/mbox-lock.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/mbox/mbox-lock.c Sun Sep 16 11:40:56 2007 +0300 @@ -286,13 +286,13 @@ } static int mbox_lock_dotlock(struct mbox_lock_context *ctx, int lock_type, - time_t max_wait_time __attr_unused__) + time_t max_wait_time ATTR_UNUSED) { return mbox_lock_dotlock_int(ctx, lock_type, FALSE); } static int mbox_lock_dotlock_try(struct mbox_lock_context *ctx, int lock_type, - time_t max_wait_time __attr_unused__) + time_t max_wait_time ATTR_UNUSED) { return mbox_lock_dotlock_int(ctx, lock_type, TRUE); }
--- a/src/lib-storage/index/mbox/mbox-save.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/mbox/mbox-save.c Sun Sep 16 11:40:56 2007 +0300 @@ -372,7 +372,7 @@ int mbox_save_init(struct mailbox_transaction_context *_t, enum mail_flags flags, struct mail_keywords *keywords, - time_t received_date, int timezone_offset __attr_unused__, + time_t received_date, int timezone_offset ATTR_UNUSED, const char *from_envelope, struct istream *input, struct mail *dest_mail, struct mail_save_context **ctx_r) {
--- a/src/lib-storage/index/mbox/mbox-sync-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/index/mbox/mbox-sync-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -148,7 +148,7 @@ int mbox_sync(struct mbox_mailbox *mbox, enum mbox_sync_flags flags); int mbox_sync_has_changed(struct mbox_mailbox *mbox, bool leave_dirty); void mbox_sync_set_critical(struct mbox_sync_context *sync_ctx, - const char *fmt, ...) __attr_format__(2, 3); + const char *fmt, ...) ATTR_FORMAT(2, 3); void mbox_sync_parse_next_mail(struct istream *input, struct mbox_sync_mail_context *ctx);
--- a/src/lib-storage/list/mailbox-list-fs.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/list/mailbox-list-fs.c Sun Sep 16 11:40:56 2007 +0300 @@ -246,7 +246,7 @@ } static const char * -fs_list_join_refpattern(struct mailbox_list *_list __attr_unused__, +fs_list_join_refpattern(struct mailbox_list *_list ATTR_UNUSED, const char *ref, const char *pattern) { if (*pattern == '/' || *pattern == '~') {
--- a/src/lib-storage/list/mailbox-list-maildir.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/list/mailbox-list-maildir.c Sun Sep 16 11:40:56 2007 +0300 @@ -115,12 +115,12 @@ return TRUE; } -static bool __attr_noreturn__ -maildir_is_valid_pattern(struct mailbox_list *list __attr_unused__, - const char *pattern __attr_unused__) +static bool ATTR_NORETURN +maildir_is_valid_pattern(struct mailbox_list *list ATTR_UNUSED, + const char *pattern ATTR_UNUSED) { i_unreached(); -#ifndef __attrs_used__ +#ifndef ATTRS_DEFINED return FALSE; #endif }
--- a/src/lib-storage/mail-storage-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/mail-storage-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -308,7 +308,7 @@ void mail_storage_set_error(struct mail_storage *storage, enum mail_error error, const char *string); void mail_storage_set_critical(struct mail_storage *storage, - const char *fmt, ...) __attr_format__(2, 3); + const char *fmt, ...) ATTR_FORMAT(2, 3); void mail_storage_set_internal_error(struct mail_storage *storage); bool mail_storage_set_error_from_errno(struct mail_storage *storage);
--- a/src/lib-storage/mailbox-list-private.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/mailbox-list-private.h Sun Sep 16 11:40:56 2007 +0300 @@ -104,7 +104,7 @@ void mailbox_list_set_error(struct mailbox_list *list, enum mail_error error, const char *string); void mailbox_list_set_critical(struct mailbox_list *list, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); void mailbox_list_set_internal_error(struct mailbox_list *list); bool mailbox_list_set_error_from_errno(struct mailbox_list *list);
--- a/src/lib-storage/mailbox-list.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib-storage/mailbox-list.c Sun Sep 16 11:40:56 2007 +0300 @@ -406,7 +406,7 @@ } enum mailbox_list_file_type -mailbox_list_get_file_type(const struct dirent *d __attr_unused__) +mailbox_list_get_file_type(const struct dirent *d ATTR_UNUSED) { enum mailbox_list_file_type type;
--- a/src/lib/backtrace-string.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/backtrace-string.c Sun Sep 16 11:40:56 2007 +0300 @@ -46,7 +46,7 @@ unsigned int pos; }; -static int walk_callback(uintptr_t ptr, int signo __attr_unused__, +static int walk_callback(uintptr_t ptr, int signo ATTR_UNUSED, void *context) { struct walk_context *ctx = context; @@ -74,7 +74,7 @@ return 0; } #else -int backtrace_append(string_t *str __attr_unused__) +int backtrace_append(string_t *str ATTR_UNUSED) { return -1; }
--- a/src/lib/data-stack.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/data-stack.c Sun Sep 16 11:40:56 2007 +0300 @@ -502,7 +502,7 @@ return mem; } -bool t_try_realloc(void *mem __attr_unused__, size_t size __attr_unused__) +bool t_try_realloc(void *mem ATTR_UNUSED, size_t size ATTR_UNUSED) { return FALSE; }
--- a/src/lib/data-stack.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/data-stack.h Sun Sep 16 11:40:56 2007 +0300 @@ -53,8 +53,8 @@ t_malloc() calls never fail, but return NULL if size == 0. If there's not enough memory left, i_panic() will be called. */ -void *t_malloc(size_t size) __attr_malloc__; -void *t_malloc0(size_t size) __attr_malloc__; +void *t_malloc(size_t size) ATTR_MALLOC; +void *t_malloc0(size_t size) ATTR_MALLOC; /* Try growing allocated memory. Returns TRUE if successful. Works only for last allocated memory in current stack frame. */
--- a/src/lib/failures.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/failures.c Sun Sep 16 11:40:56 2007 +0300 @@ -13,24 +13,24 @@ #include <syslog.h> #include <time.h> -static void failure_exit(int status) __attr_noreturn__; +static void failure_exit(int status) ATTR_NORETURN; static void default_panic_handler(const char *format, va_list args) - __attr_noreturn__ __attr_format__(1, 0); + ATTR_NORETURN ATTR_FORMAT(1, 0); static void default_fatal_handler(int status, const char *format, va_list args) - __attr_noreturn__ __attr_format__(2, 0); + ATTR_NORETURN ATTR_FORMAT(2, 0); static void default_error_handler(const char *format, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); static void default_warning_handler(const char *format, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); static void default_info_handler(const char *format, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); /* Initialize working defaults */ -static failure_callback_t *panic_handler __attr_noreturn__ = +static failure_callback_t *panic_handler ATTR_NORETURN = default_panic_handler; -static fatal_failure_callback_t *fatal_handler __attr_noreturn__ = +static fatal_failure_callback_t *fatal_handler ATTR_NORETURN = default_fatal_handler; static failure_callback_t *error_handler = default_error_handler; static failure_callback_t *warning_handler = default_warning_handler; @@ -42,9 +42,9 @@ /* kludgy .. we want to trust log_stamp_format with -Wformat-nonliteral */ static const char *get_log_stamp_format(const char *unused) - __attr_format_arg__(1); + ATTR_FORMAT_ARG(1); -static const char *get_log_stamp_format(const char *unused __attr_unused__) +static const char *get_log_stamp_format(const char *unused ATTR_UNUSED) { return log_stamp_format; } @@ -75,7 +75,7 @@ } } -static int __attr_format__(3, 0) +static int ATTR_FORMAT(3, 0) default_handler(const char *prefix, FILE *f, const char *format, va_list args) { static int recursed = 0; @@ -125,7 +125,7 @@ return 0; } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) default_panic_handler(const char *format, va_list args) { const char *backtrace; @@ -164,7 +164,7 @@ return 0; } -static void __attr_format__(2, 0) +static void ATTR_FORMAT(2, 0) default_fatal_handler(int status, const char *format, va_list args) { if (default_handler("Fatal: ", log_fd, format, args) < 0 && @@ -177,7 +177,7 @@ failure_exit(status); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) default_error_handler(const char *format, va_list args) { if (default_handler("Error: ", log_fd, format, args) < 0) @@ -187,7 +187,7 @@ failure_exit(FATAL_LOGWRITE); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) default_warning_handler(const char *format, va_list args) { (void)default_handler("Warning: ", log_fd, format, args); @@ -196,7 +196,7 @@ failure_exit(FATAL_LOGWRITE); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) default_info_handler(const char *format, va_list args) { (void)default_handler("Info: ", log_info_fd, format, args); @@ -268,14 +268,14 @@ errno = old_errno; } -void i_set_panic_handler(failure_callback_t *callback __attr_noreturn__) +void i_set_panic_handler(failure_callback_t *callback ATTR_NORETURN) { if (callback == NULL) callback = default_panic_handler; panic_handler = callback; } -void i_set_fatal_handler(fatal_failure_callback_t *callback __attr_noreturn__) +void i_set_fatal_handler(fatal_failure_callback_t *callback ATTR_NORETURN) { if (callback == NULL) callback = default_fatal_handler; @@ -303,7 +303,7 @@ info_handler = callback; } -static int __attr_format__(2, 0) +static int ATTR_FORMAT(2, 0) syslog_handler(int level, const char *format, va_list args) { static int recursed = 0; @@ -406,7 +406,7 @@ log_prefix = i_strdup(prefix); } -static int __attr_format__(2, 0) +static int ATTR_FORMAT(2, 0) internal_handler(char log_type, const char *format, va_list args) { string_t *str; @@ -424,7 +424,7 @@ return ret; } -static void __attr_noreturn__ __attr_format__(1, 0) +static void ATTR_NORETURN ATTR_FORMAT(1, 0) i_internal_panic_handler(const char *fmt, va_list args) { const char *backtrace; @@ -435,7 +435,7 @@ abort(); } -static void __attr_noreturn__ __attr_format__(2, 0) +static void ATTR_NORETURN ATTR_FORMAT(2, 0) i_internal_fatal_handler(int status, const char *fmt, va_list args) { if (internal_handler('F', fmt, args) < 0 && status == FATAL_DEFAULT) @@ -443,20 +443,20 @@ failure_exit(status); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) i_internal_error_handler(const char *fmt, va_list args) { if (internal_handler('E', fmt, args) < 0) failure_exit(FATAL_LOGERROR); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) i_internal_warning_handler(const char *fmt, va_list args) { (void)internal_handler('W', fmt, args); } -static void __attr_format__(1, 0) +static void ATTR_FORMAT(1, 0) i_internal_info_handler(const char *fmt, va_list args) { (void)internal_handler('I', fmt, args);
--- a/src/lib/failures.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/failures.h Sun Sep 16 11:40:56 2007 +0300 @@ -17,33 +17,33 @@ typedef void failure_callback_t(const char *, va_list); typedef void fatal_failure_callback_t(int status, const char *, va_list); -void i_panic(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__; -void i_fatal(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__; -void i_error(const char *format, ...) __attr_format__(1, 2); -void i_warning(const char *format, ...) __attr_format__(1, 2); -void i_info(const char *format, ...) __attr_format__(1, 2); +void i_panic(const char *format, ...) ATTR_FORMAT(1, 2) ATTR_NORETURN; +void i_fatal(const char *format, ...) ATTR_FORMAT(1, 2) ATTR_NORETURN; +void i_error(const char *format, ...) ATTR_FORMAT(1, 2); +void i_warning(const char *format, ...) ATTR_FORMAT(1, 2); +void i_info(const char *format, ...) ATTR_FORMAT(1, 2); void i_fatal_status(int status, const char *format, ...) - __attr_format__(2, 3) __attr_noreturn__; + ATTR_FORMAT(2, 3) ATTR_NORETURN; /* Change failure handlers. Make sure they don't modify errno. */ -void i_set_panic_handler(failure_callback_t *callback __attr_noreturn__); -void i_set_fatal_handler(fatal_failure_callback_t *callback __attr_noreturn__); +void i_set_panic_handler(failure_callback_t *callback ATTR_NORETURN); +void i_set_fatal_handler(fatal_failure_callback_t *callback ATTR_NORETURN); void i_set_error_handler(failure_callback_t *callback); void i_set_warning_handler(failure_callback_t *callback); void i_set_info_handler(failure_callback_t *callback); /* Send failures to syslog() */ void i_syslog_panic_handler(const char *fmt, va_list args) - __attr_noreturn__ __attr_format__(1, 0); + ATTR_NORETURN ATTR_FORMAT(1, 0); void i_syslog_fatal_handler(int status, const char *fmt, va_list args) - __attr_noreturn__ __attr_format__(2, 0); + ATTR_NORETURN ATTR_FORMAT(2, 0); void i_syslog_error_handler(const char *fmt, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); void i_syslog_warning_handler(const char *fmt, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); void i_syslog_info_handler(const char *fmt, va_list args) - __attr_format__(1, 0); + ATTR_FORMAT(1, 0); /* Open syslog and set failure/info handlers to use it. */ void i_set_failure_syslog(const char *ident, int options, int facility);
--- a/src/lib/fdpass.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/fdpass.c Sun Sep 16 11:40:56 2007 +0300 @@ -195,15 +195,15 @@ # ifdef __GNUC__ # warning SCM_RIGHTS not supported, privilege separation not possible # endif -ssize_t fd_send(int handle __attr_unused__, int send_fd __attr_unused__, - const void *data __attr_unused__, size_t size __attr_unused__) +ssize_t fd_send(int handle ATTR_UNUSED, int send_fd ATTR_UNUSED, + const void *data ATTR_UNUSED, size_t size ATTR_UNUSED) { errno = ENOSYS; return -1; } -ssize_t fd_read(int handle __attr_unused__, void *data __attr_unused__, - size_t size __attr_unused__, int *fd __attr_unused__) +ssize_t fd_read(int handle ATTR_UNUSED, void *data ATTR_UNUSED, + size_t size ATTR_UNUSED, int *fd ATTR_UNUSED) { errno = ENOSYS; return -1;
--- a/src/lib/imem.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/imem.h Sun Sep 16 11:40:56 2007 +0300 @@ -7,25 +7,25 @@ #define i_new(type, count) p_new(default_pool, type, count) -void *i_malloc(size_t size) __attr_malloc__; +void *i_malloc(size_t size) ATTR_MALLOC; void *i_realloc(void *mem, size_t old_size, size_t new_size) - __attr_warn_unused_result__; + ATTR_WARN_UNUSED_RESULT; #define i_free(mem) p_free(default_pool, mem) #define i_free_and_null(mem) p_free_and_null(default_pool, mem) /* string functions */ -char *i_strdup(const char *str) __attr_malloc__; +char *i_strdup(const char *str) ATTR_MALLOC; /* like i_strdup(), but if str == "", return NULL */ -char *i_strdup_empty(const char *str) __attr_malloc__; +char *i_strdup_empty(const char *str) ATTR_MALLOC; /* *end isn't included */ -char *i_strdup_until(const void *str, const void *end) __attr_malloc__; -char *i_strndup(const void *str, size_t max_chars) __attr_malloc__; +char *i_strdup_until(const void *str, const void *end) ATTR_MALLOC; +char *i_strndup(const void *str, size_t max_chars) ATTR_MALLOC; char *i_strdup_printf(const char *format, ...) - __attr_format__(1, 2) __attr_malloc__; + ATTR_FORMAT(1, 2) ATTR_MALLOC; char *i_strdup_vprintf(const char *format, va_list args) - __attr_format__(1, 0) __attr_malloc__; + ATTR_FORMAT(1, 0) ATTR_MALLOC; -char *i_strconcat(const char *str1, ...) __attr_sentinel__ __attr_malloc__; +char *i_strconcat(const char *str1, ...) ATTR_SENTINEL ATTR_MALLOC; #endif
--- a/src/lib/ioloop-notify-dn.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/ioloop-notify-dn.c Sun Sep 16 11:40:56 2007 +0300 @@ -29,8 +29,8 @@ static struct ioloop_notify_handler_context *io_loop_notify_handler_init(void); -static void sigrt_handler(int signo __attr_unused__, siginfo_t *si, - void *data __attr_unused__) +static void sigrt_handler(int signo ATTR_UNUSED, siginfo_t *si, + void *data ATTR_UNUSED) { struct ioloop_notify_handler_context *ctx = current_ioloop->notify_handler_context;
--- a/src/lib/ioloop-notify-none.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/ioloop-notify-none.c Sun Sep 16 11:40:56 2007 +0300 @@ -7,20 +7,20 @@ #undef io_add_notify enum io_notify_result -io_add_notify(const char *path __attr_unused__, - io_callback_t *callback __attr_unused__, - void *context __attr_unused__, struct io **io_r) +io_add_notify(const char *path ATTR_UNUSED, + io_callback_t *callback ATTR_UNUSED, + void *context ATTR_UNUSED, struct io **io_r) { *io_r = NULL; return IO_NOTIFY_DISABLED; } -void io_loop_notify_remove(struct ioloop *ioloop __attr_unused__, - struct io *io __attr_unused__) +void io_loop_notify_remove(struct ioloop *ioloop ATTR_UNUSED, + struct io *io ATTR_UNUSED) { } -void io_loop_notify_handler_deinit(struct ioloop *ioloop __attr_unused__) +void io_loop_notify_handler_deinit(struct ioloop *ioloop ATTR_UNUSED) { }
--- a/src/lib/istream-data.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-data.c Sun Sep 16 11:40:56 2007 +0300 @@ -3,22 +3,22 @@ #include "lib.h" #include "istream-internal.h" -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { } -static void _destroy(struct _iostream *stream __attr_unused__) +static void _destroy(struct _iostream *stream ATTR_UNUSED) { } -static ssize_t _read(struct _istream *stream __attr_unused__) +static ssize_t _read(struct _istream *stream ATTR_UNUSED) { stream->istream.eof = TRUE; return -1; } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { stream->skip = v_offset; stream->istream.v_offset = v_offset;
--- a/src/lib/istream-file.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-file.c Sun Sep 16 11:40:56 2007 +0300 @@ -117,7 +117,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { struct file_istream *fstream = (struct file_istream *) stream; @@ -145,7 +145,7 @@ } static const struct stat * -_stat(struct _istream *stream, bool exact __attr_unused__) +_stat(struct _istream *stream, bool exact ATTR_UNUSED) { struct file_istream *fstream = (struct file_istream *) stream;
--- a/src/lib/istream-limit.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-limit.c Sun Sep 16 11:40:56 2007 +0300 @@ -10,7 +10,7 @@ uoff_t v_start_offset, v_size; }; -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { } @@ -82,7 +82,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { struct limit_istream *lstream = (struct limit_istream *) stream;
--- a/src/lib/istream-mmap.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-mmap.c Sun Sep 16 11:40:56 2007 +0300 @@ -131,7 +131,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { struct mmap_istream *mstream = (struct mmap_istream *) stream; @@ -175,7 +175,7 @@ } static const struct stat * -_stat(struct _istream *stream, bool exact __attr_unused__) +_stat(struct _istream *stream, bool exact ATTR_UNUSED) { struct mmap_istream *mstream = (struct mmap_istream *) stream;
--- a/src/lib/istream-seekable.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-seekable.c Sun Sep 16 11:40:56 2007 +0300 @@ -29,7 +29,7 @@ int fd; }; -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { struct seekable_istream *sstream = (struct seekable_istream *)stream; unsigned int i; @@ -252,7 +252,7 @@ } static void _seek(struct _istream *stream, uoff_t v_offset, - bool mark __attr_unused__) + bool mark ATTR_UNUSED) { stream->istream.stream_errno = 0; stream->istream.v_offset = v_offset;
--- a/src/lib/istream-tee.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream-tee.c Sun Sep 16 11:40:56 2007 +0300 @@ -141,9 +141,9 @@ return ret; } -static void __attr_noreturn__ -_seek(struct _istream *stream __attr_unused__, - uoff_t v_offset __attr_unused__, bool mark __attr_unused__) +static void ATTR_NORETURN +_seek(struct _istream *stream ATTR_UNUSED, + uoff_t v_offset ATTR_UNUSED, bool mark ATTR_UNUSED) { i_panic("tee-istream: seeking unsupported currently"); }
--- a/src/lib/istream.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/istream.c Sun Sep 16 11:40:56 2007 +0300 @@ -298,7 +298,7 @@ } static const struct stat * -_stat(struct _istream *stream, bool exact __attr_unused__) +_stat(struct _istream *stream, bool exact ATTR_UNUSED) { return &stream->statbuf; }
--- a/src/lib/lib-signals.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/lib-signals.c Sun Sep 16 11:40:56 2007 +0300 @@ -52,13 +52,13 @@ } } -static void sig_ignore(int signo __attr_unused__) +static void sig_ignore(int signo ATTR_UNUSED) { /* if we used SIG_IGN instead of this function, the system call might be restarted */ } -static void signal_read(void *context __attr_unused__) +static void signal_read(void *context ATTR_UNUSED) { unsigned char signal_buf[512]; unsigned char signal_mask[MAX_SIGNAL_VALUE+1];
--- a/src/lib/macros.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/macros.h Sun Sep 16 11:40:56 2007 +0300 @@ -96,34 +96,34 @@ /* Provide macros to feature the GCC function attribute. */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -# define __attrs_used__ -# define __attr_format__(format_idx, arg_idx) \ +# define ATTRS_DEFINED +# define ATTR_FORMAT(format_idx, arg_idx) \ __attribute__((format (printf, format_idx, arg_idx))) -# define __attr_format_arg__(arg_idx) \ +# define ATTR_FORMAT_ARG(arg_idx) \ __attribute__((format_arg (arg_idx))) -# define __attr_scanf__(format_idx, arg_idx) \ +# define ATTR_SCANF(format_idx, arg_idx) \ __attribute__((format (scanf, format_idx, arg_idx))) -# define __attr_unused__ __attribute__((unused)) -# define __attr_noreturn__ __attribute__((noreturn)) -# define __attr_const__ __attribute__((const)) -# define __attr_malloc__ __attribute__((malloc)) +# define ATTR_UNUSED __attribute__((unused)) +# define ATTR_NORETURN __attribute__((noreturn)) +# define ATTR_CONST __attribute__((const)) +# define ATTR_MALLOC __attribute__((malloc)) #else -# define __attr_format__(format_idx, arg_idx) -# define __attr_format_arg__(arg_idx) -# define __attr_scanf__ -# define __attr_unused__ -# define __attr_noreturn__ -# define __attr_const__ -# define __attr_unused__ -# define __attr_malloc__ +# define ATTR_FORMAT(format_idx, arg_idx) +# define ATTR_FORMAT_ARG(arg_idx) +# define ATTR_SCANF +# define ATTR_UNUSED +# define ATTR_NORETURN +# define ATTR_CONST +# define ATTR_UNUSED +# define ATTR_MALLOC #endif #if __GNUC__ > 3 /* GCC 4.0 and later */ -# define __attr_warn_unused_result__ __attribute__((warn_unused_result)) -# define __attr_sentinel__ __attribute__((sentinel)) +# define ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) +# define ATTR_SENTINEL __attribute__((sentinel)) #else -# define __attr_warn_unused_result__ -# define __attr_sentinel__ +# define ATTR_WARN_UNUSED_RESULT +# define ATTR_SENTINEL #endif /* C99-style struct member definitions */
--- a/src/lib/mempool-alloconly.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool-alloconly.c Sun Sep 16 11:40:56 2007 +0300 @@ -93,7 +93,7 @@ } #endif -pool_t pool_alloconly_create(const char *name __attr_unused__, size_t size) +pool_t pool_alloconly_create(const char *name ATTR_UNUSED, size_t size) { struct alloconly_pool apool, *new_apool; size_t min_alloc = sizeof(struct alloconly_pool) + SIZEOF_POOLBLOCK; @@ -161,7 +161,7 @@ #endif } -static const char *pool_alloconly_get_name(pool_t pool __attr_unused__) +static const char *pool_alloconly_get_name(pool_t pool ATTR_UNUSED) { #ifdef DEBUG struct alloconly_pool *apool = (struct alloconly_pool *)pool;
--- a/src/lib/mempool-datastack.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool-datastack.c Sun Sep 16 11:40:56 2007 +0300 @@ -55,7 +55,7 @@ return &dpool->pool; } -static const char *pool_data_stack_get_name(pool_t pool __attr_unused__) +static const char *pool_data_stack_get_name(pool_t pool ATTR_UNUSED) { return "data stack"; } @@ -83,7 +83,7 @@ *pool = NULL; } -static void *pool_data_stack_malloc(pool_t pool __attr_unused__, size_t size) +static void *pool_data_stack_malloc(pool_t pool ATTR_UNUSED, size_t size) { struct datastack_pool *dpool = (struct datastack_pool *) pool; @@ -96,7 +96,7 @@ return t_malloc0(size); } -static void pool_data_stack_free(pool_t pool, void *mem __attr_unused__) +static void pool_data_stack_free(pool_t pool, void *mem ATTR_UNUSED) { struct datastack_pool *dpool = (struct datastack_pool *) pool; @@ -133,12 +133,12 @@ return mem; } -static void pool_data_stack_clear(pool_t pool __attr_unused__) +static void pool_data_stack_clear(pool_t pool ATTR_UNUSED) { } static size_t -pool_data_stack_get_max_easy_alloc_size(pool_t pool __attr_unused__) +pool_data_stack_get_max_easy_alloc_size(pool_t pool ATTR_UNUSED) { return t_get_bytes_available(); }
--- a/src/lib/mempool-system-clean.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool-system-clean.c Sun Sep 16 11:40:56 2007 +0300 @@ -60,16 +60,16 @@ pool_t system_clean_pool = &static_system_clean_pool; -static const char *pool_system_clean_get_name(pool_t pool __attr_unused__) +static const char *pool_system_clean_get_name(pool_t pool ATTR_UNUSED) { return "system clean"; } -static void pool_system_clean_ref(pool_t pool __attr_unused__) +static void pool_system_clean_ref(pool_t pool ATTR_UNUSED) { } -static void pool_system_clean_unref(pool_t *pool __attr_unused__) +static void pool_system_clean_unref(pool_t *pool ATTR_UNUSED) { } @@ -84,7 +84,7 @@ #endif } -static void *pool_system_clean_malloc(pool_t pool __attr_unused__, size_t size) +static void *pool_system_clean_malloc(pool_t pool ATTR_UNUSED, size_t size) { void *mem; @@ -114,7 +114,7 @@ return mem; } -static void pool_system_clean_free(pool_t pool __attr_unused__, void *mem) +static void pool_system_clean_free(pool_t pool ATTR_UNUSED, void *mem) { if (mem != NULL) { safe_memset(mem, 0, mem_get_size(mem)); @@ -127,7 +127,7 @@ } } -static void *pool_system_clean_realloc(pool_t pool __attr_unused__, void *mem, +static void *pool_system_clean_realloc(pool_t pool ATTR_UNUSED, void *mem, size_t old_size, size_t new_size) { void *new_mem; @@ -154,14 +154,14 @@ return new_mem; } -static void __attr_noreturn__ -pool_system_clean_clear(pool_t pool __attr_unused__) +static void ATTR_NORETURN +pool_system_clean_clear(pool_t pool ATTR_UNUSED) { i_panic("pool_system_clean_clear() must not be called"); } static size_t -pool_system_clean_get_max_easy_alloc_size(pool_t pool __attr_unused__) +pool_system_clean_get_max_easy_alloc_size(pool_t pool ATTR_UNUSED) { return 0; }
--- a/src/lib/mempool-system.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool-system.c Sun Sep 16 11:40:56 2007 +0300 @@ -50,20 +50,20 @@ pool_t system_pool = &static_system_pool; -static const char *pool_system_get_name(pool_t pool __attr_unused__) +static const char *pool_system_get_name(pool_t pool ATTR_UNUSED) { return "system"; } -static void pool_system_ref(pool_t pool __attr_unused__) +static void pool_system_ref(pool_t pool ATTR_UNUSED) { } -static void pool_system_unref(pool_t *pool __attr_unused__) +static void pool_system_unref(pool_t *pool ATTR_UNUSED) { } -static void *pool_system_malloc(pool_t pool __attr_unused__, size_t size) +static void *pool_system_malloc(pool_t pool ATTR_UNUSED, size_t size) { void *mem; @@ -82,8 +82,8 @@ return mem; } -static void pool_system_free(pool_t pool __attr_unused__, - void *mem __attr_unused__) +static void pool_system_free(pool_t pool ATTR_UNUSED, + void *mem ATTR_UNUSED) { #ifndef USE_GC if (mem != NULL) @@ -91,7 +91,7 @@ #endif } -static void *pool_system_realloc(pool_t pool __attr_unused__, void *mem, +static void *pool_system_realloc(pool_t pool ATTR_UNUSED, void *mem, size_t old_size, size_t new_size) { if (new_size == 0 || new_size > SSIZE_T_MAX) @@ -120,13 +120,13 @@ return mem; } -static void __attr_noreturn__ -pool_system_clear(pool_t pool __attr_unused__) +static void ATTR_NORETURN +pool_system_clear(pool_t pool ATTR_UNUSED) { i_panic("pool_system_clear() must not be called"); } -static size_t pool_system_get_max_easy_alloc_size(pool_t pool __attr_unused__) +static size_t pool_system_get_max_easy_alloc_size(pool_t pool ATTR_UNUSED) { return 0; }
--- a/src/lib/mempool-unsafe-datastack.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool-unsafe-datastack.c Sun Sep 16 11:40:56 2007 +0300 @@ -39,20 +39,20 @@ pool_t unsafe_data_stack_pool = &static_unsafe_data_stack_pool; -static const char *pool_unsafe_data_stack_get_name(pool_t pool __attr_unused__) +static const char *pool_unsafe_data_stack_get_name(pool_t pool ATTR_UNUSED) { return "unsafe data stack"; } -static void pool_unsafe_data_stack_ref(pool_t pool __attr_unused__) +static void pool_unsafe_data_stack_ref(pool_t pool ATTR_UNUSED) { } -static void pool_unsafe_data_stack_unref(pool_t *pool __attr_unused__) +static void pool_unsafe_data_stack_unref(pool_t *pool ATTR_UNUSED) { } -static void *pool_unsafe_data_stack_malloc(pool_t pool __attr_unused__, +static void *pool_unsafe_data_stack_malloc(pool_t pool ATTR_UNUSED, size_t size) { if (size == 0 || size > SSIZE_T_MAX) @@ -61,12 +61,12 @@ return t_malloc0(size); } -static void pool_unsafe_data_stack_free(pool_t pool __attr_unused__, - void *mem __attr_unused__) +static void pool_unsafe_data_stack_free(pool_t pool ATTR_UNUSED, + void *mem ATTR_UNUSED) { } -static void *pool_unsafe_data_stack_realloc(pool_t pool __attr_unused__, +static void *pool_unsafe_data_stack_realloc(pool_t pool ATTR_UNUSED, void *mem, size_t old_size, size_t new_size) { @@ -92,12 +92,12 @@ return mem; } -static void pool_unsafe_data_stack_clear(pool_t pool __attr_unused__) +static void pool_unsafe_data_stack_clear(pool_t pool ATTR_UNUSED) { } static size_t -pool_unsafe_data_stack_get_max_easy_alloc_size(pool_t pool __attr_unused__) +pool_unsafe_data_stack_get_max_easy_alloc_size(pool_t pool ATTR_UNUSED) { return t_get_bytes_available(); }
--- a/src/lib/mempool.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mempool.h Sun Sep 16 11:40:56 2007 +0300 @@ -28,7 +28,7 @@ /* memory in old_size..new_size will be zeroed */ void *(*realloc)(pool_t pool, void *mem, size_t old_size, size_t new_size) - __attr_warn_unused_result__; + ATTR_WARN_UNUSED_RESULT; /* Frees all the memory in pool. NOTE: system_pool doesn't support this and crashes if it's used */
--- a/src/lib/mmap-anon.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mmap-anon.c Sun Sep 16 11:40:56 2007 +0300 @@ -108,7 +108,7 @@ return new_base; } -void *mremap_anon(void *old_address, size_t old_size __attr_unused__, +void *mremap_anon(void *old_address, size_t old_size ATTR_UNUSED, size_t new_size, unsigned long flags) { struct anon_header *hdr; @@ -145,7 +145,7 @@ return old_address; } -int munmap_anon(void *start, size_t length __attr_unused__) +int munmap_anon(void *start, size_t length ATTR_UNUSED) { struct anon_header *hdr;
--- a/src/lib/mmap-util.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mmap-util.c Sun Sep 16 11:40:56 2007 +0300 @@ -38,8 +38,8 @@ } #ifndef HAVE_MADVISE -int my_madvise(void *start __attr_unused__, size_t length __attr_unused__, - int advice __attr_unused__) +int my_madvise(void *start ATTR_UNUSED, size_t length ATTR_UNUSED, + int advice ATTR_UNUSED) { return 0; }
--- a/src/lib/mmap-util.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/mmap-util.h Sun Sep 16 11:40:56 2007 +0300 @@ -37,6 +37,6 @@ unsigned long flags); int munmap_anon(void *start, size_t length); -size_t mmap_get_page_size(void) __attr_const__; +size_t mmap_get_page_size(void) ATTR_CONST; #endif
--- a/src/lib/module-dir.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/module-dir.c Sun Sep 16 11:40:56 2007 +0300 @@ -344,19 +344,19 @@ #else -struct module *module_dir_load(const char *dir __attr_unused__, - const char *module_names __attr_unused__, - bool require_init_funcs __attr_unused__) +struct module *module_dir_load(const char *dir ATTR_UNUSED, + const char *module_names ATTR_UNUSED, + bool require_init_funcs ATTR_UNUSED) { i_error("Dynamically loadable module support not built in"); return NULL; } -void module_dir_deinit(struct module *modules __attr_unused__) +void module_dir_deinit(struct module *modules ATTR_UNUSED) { } -void module_dir_unload(struct module **modules __attr_unused__) +void module_dir_unload(struct module **modules ATTR_UNUSED) { }
--- a/src/lib/network.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/network.c Sun Sep 16 11:40:56 2007 +0300 @@ -231,7 +231,7 @@ i_fatal("fd_set_nonblock(%d) failed: %m", fd); } -int net_set_cork(int fd __attr_unused__, bool cork __attr_unused__) +int net_set_cork(int fd ATTR_UNUSED, bool cork ATTR_UNUSED) { #ifdef TCP_CORK int val = cork;
--- a/src/lib/nfs-workarounds.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/nfs-workarounds.c Sun Sep 16 11:40:56 2007 +0300 @@ -223,8 +223,8 @@ } void nfs_flush_read_cache(const char *path, int fd, - int lock_type __attr_unused__, - bool just_locked __attr_unused__) + int lock_type ATTR_UNUSED, + bool just_locked ATTR_UNUSED) { #ifdef READ_CACHE_FLUSH_FCNTL if (!just_locked)
--- a/src/lib/ostream-crlf.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/ostream-crlf.c Sun Sep 16 11:40:56 2007 +0300 @@ -20,7 +20,7 @@ static const struct const_iovec cr_iov = { "\r", 1 }; -static void _close(struct _iostream *stream __attr_unused__) +static void _close(struct _iostream *stream ATTR_UNUSED) { }
--- a/src/lib/printf-format-fix.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/printf-format-fix.h Sun Sep 16 11:40:56 2007 +0300 @@ -3,13 +3,13 @@ /* Replaces %m in format with strerror(errno) and panics if %n modifier is used. If the format string was modified, it's returned from data stack. */ -const char *printf_format_fix(const char *format) __attr_format_arg__(1); +const char *printf_format_fix(const char *format) ATTR_FORMAT_ARG(1); /* Like printf_format_fix(), except return also the format string's length. */ const char *printf_format_fix_get_len(const char *format, unsigned int *len_r) - __attr_format_arg__(1); + ATTR_FORMAT_ARG(1); /* Like printf_format_fix(), except the format string is written to data stack without actually allocating it. Data stack must not be used until format string is no longer needed. */ -const char *printf_format_fix_unsafe(const char *format) __attr_format_arg__(1); +const char *printf_format_fix_unsafe(const char *format) ATTR_FORMAT_ARG(1); #endif
--- a/src/lib/process-title.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/process-title.c Sun Sep 16 11:40:56 2007 +0300 @@ -55,8 +55,8 @@ #endif -void process_title_init(char *argv[] __attr_unused__, - char *envp[] __attr_unused__) +void process_title_init(char *argv[] ATTR_UNUSED, + char *envp[] ATTR_UNUSED) { #ifdef LINUX_PROCTITLE_HACK linux_proctitle_init(argv, envp); @@ -64,7 +64,7 @@ process_name = argv[0]; } -void process_title_set(const char *title __attr_unused__) +void process_title_set(const char *title ATTR_UNUSED) { i_assert(process_name != NULL);
--- a/src/lib/restrict-process-size.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/restrict-process-size.c Sun Sep 16 11:40:56 2007 +0300 @@ -9,8 +9,8 @@ # include <sys/resource.h> #endif -void restrict_process_size(unsigned int size __attr_unused__, - unsigned int max_processes __attr_unused__) +void restrict_process_size(unsigned int size ATTR_UNUSED, + unsigned int max_processes ATTR_UNUSED) { #ifdef HAVE_SETRLIMIT struct rlimit rlim;
--- a/src/lib/sendfile-util.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/sendfile-util.c Sun Sep 16 11:40:56 2007 +0300 @@ -131,9 +131,9 @@ } #else -ssize_t safe_sendfile(int out_fd __attr_unused__, int in_fd __attr_unused__, - uoff_t *offset __attr_unused__, - size_t count __attr_unused__) +ssize_t safe_sendfile(int out_fd ATTR_UNUSED, int in_fd ATTR_UNUSED, + uoff_t *offset ATTR_UNUSED, + size_t count ATTR_UNUSED) { errno = EINVAL; return -1;
--- a/src/lib/str.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/str.h Sun Sep 16 11:40:56 2007 +0300 @@ -19,9 +19,9 @@ /* Append printf()-like data */ void str_printfa(string_t *str, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); void str_vprintfa(string_t *str, const char *fmt, va_list args) - __attr_format__(2, 0); + ATTR_FORMAT(2, 0); void str_insert(string_t *str, size_t pos, const char *cstr); void str_delete(string_t *str, size_t pos, size_t len);
--- a/src/lib/strfuncs.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/strfuncs.h Sun Sep 16 11:40:56 2007 +0300 @@ -8,36 +8,36 @@ /* Returns -1 if dest wasn't large enough, 0 if not. */ int i_snprintf(char *dest, size_t max_chars, const char *format, ...) - __attr_format__(3, 4); + ATTR_FORMAT(3, 4); -char *p_strdup(pool_t pool, const char *str) __attr_malloc__; +char *p_strdup(pool_t pool, const char *str) ATTR_MALLOC; /* return NULL if str = "" */ -char *p_strdup_empty(pool_t pool, const char *str) __attr_malloc__; +char *p_strdup_empty(pool_t pool, const char *str) ATTR_MALLOC; /* *end isn't included */ char *p_strdup_until(pool_t pool, const void *start, const void *end) - __attr_malloc__; -char *p_strndup(pool_t pool, const void *str, size_t max_chars) __attr_malloc__; + ATTR_MALLOC; +char *p_strndup(pool_t pool, const void *str, size_t max_chars) ATTR_MALLOC; char *p_strdup_printf(pool_t pool, const char *format, ...) - __attr_format__(2, 3) __attr_malloc__; + ATTR_FORMAT(2, 3) ATTR_MALLOC; char *p_strdup_vprintf(pool_t pool, const char *format, va_list args) - __attr_format__(2, 0) __attr_malloc__; + ATTR_FORMAT(2, 0) ATTR_MALLOC; char *p_strconcat(pool_t pool, const char *str1, ...) - __attr_sentinel__ __attr_malloc__; + ATTR_SENTINEL ATTR_MALLOC; /* same with temporary memory allocations: */ -const char *t_strdup(const char *str) __attr_malloc__; -char *t_strdup_noconst(const char *str) __attr_malloc__; +const char *t_strdup(const char *str) ATTR_MALLOC; +char *t_strdup_noconst(const char *str) ATTR_MALLOC; /* return NULL if str = "" */ -const char *t_strdup_empty(const char *str) __attr_malloc__; +const char *t_strdup_empty(const char *str) ATTR_MALLOC; /* *end isn't included */ -const char *t_strdup_until(const void *start, const void *end) __attr_malloc__; -const char *t_strndup(const void *str, size_t max_chars) __attr_malloc__; +const char *t_strdup_until(const void *start, const void *end) ATTR_MALLOC; +const char *t_strndup(const void *str, size_t max_chars) ATTR_MALLOC; const char *t_strdup_printf(const char *format, ...) - __attr_format__(1, 2) __attr_malloc__; + ATTR_FORMAT(1, 2) ATTR_MALLOC; const char *t_strdup_vprintf(const char *format, va_list args) - __attr_format__(1, 0) __attr_malloc__; + ATTR_FORMAT(1, 0) ATTR_MALLOC; const char *t_strconcat(const char *str1, ...) - __attr_sentinel__ __attr_malloc__; + ATTR_SENTINEL ATTR_MALLOC; /* Like t_strdup(), but stop at cutchar. */ const char *t_strcut(const char *str, char cutchar); @@ -70,15 +70,15 @@ /* separators is an array of separator characters, not a separator string. */ char **p_strsplit(pool_t pool, const char *data, const char *separators) - __attr_malloc__; + ATTR_MALLOC; const char **t_strsplit(const char *data, const char *separators) - __attr_malloc__; + ATTR_MALLOC; /* like p_strsplit(), but treats multiple adjacent separators as a single separator. */ char **p_strsplit_spaces(pool_t pool, const char *data, const char *separators) - __attr_malloc__; + ATTR_MALLOC; const char **t_strsplit_spaces(const char *data, const char *separators) - __attr_malloc__; + ATTR_MALLOC; void p_strsplit_free(pool_t pool, char **arr); const char *dec2str(uintmax_t number); @@ -87,7 +87,7 @@ unsigned int strarray_length(const char *const *arr); /* Return all strings from array joined into one string. */ const char *t_strarray_join(const char *const *arr, const char *separator) - __attr_malloc__; + ATTR_MALLOC; /* Removes a value from NULL-terminated string array. Returns TRUE if found. */ bool strarray_remove(const char **arr, const char *value); @@ -95,6 +95,6 @@ char *t_noalloc_strdup_vprintf(const char *format, va_list args, unsigned int *size_r); char *_vstrconcat(const char *str1, va_list args, size_t *ret_len) - __attr_malloc__; + ATTR_MALLOC; #endif
--- a/src/lib/utc-offset.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/utc-offset.c Sun Sep 16 11:40:56 2007 +0300 @@ -5,7 +5,7 @@ #include <sys/time.h> -int utc_offset(struct tm *tm, time_t t __attr_unused__) +int utc_offset(struct tm *tm, time_t t ATTR_UNUSED) { #ifdef HAVE_TM_GMTOFF return (int) (tm->tm_gmtoff/60);
--- a/src/lib/var-expand.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/lib/var-expand.c Sun Sep 16 11:40:56 2007 +0300 @@ -23,25 +23,25 @@ }; static const char * -m_str_lcase(const char *str, struct var_expand_context *ctx __attr_unused__) +m_str_lcase(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { return t_str_lcase(str); } static const char * -m_str_ucase(const char *str, struct var_expand_context *ctx __attr_unused__) +m_str_ucase(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { return t_str_ucase(str); } static const char * -m_str_escape(const char *str, struct var_expand_context *ctx __attr_unused__) +m_str_escape(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { return str_escape(str); } static const char * -m_str_hex(const char *str, struct var_expand_context *ctx __attr_unused__) +m_str_hex(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { unsigned long long l; @@ -50,7 +50,7 @@ } static const char * -m_str_reverse(const char *str, struct var_expand_context *ctx __attr_unused__) +m_str_reverse(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { size_t len = strlen(str); char *p, *rev; @@ -81,7 +81,7 @@ return str_c(hash); } -static const char *m_str_md5(const char *str, struct var_expand_context *ctx __attr_unused__) +static const char *m_str_md5(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { unsigned char digest[16]; @@ -90,7 +90,7 @@ return binary_to_hex(digest, sizeof(digest)); } -static const char *m_str_ldap_dn(const char *str, struct var_expand_context *ctx __attr_unused__) +static const char *m_str_ldap_dn(const char *str, struct var_expand_context *ctx ATTR_UNUSED) { string_t *ret = t_str_new(256);
--- a/src/login-common/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/login-common/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -65,7 +65,7 @@ } } -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -241,8 +241,8 @@ } } -static void auth_connect_notify(struct auth_client *client __attr_unused__, - bool connected, void *context __attr_unused__) +static void auth_connect_notify(struct auth_client *client ATTR_UNUSED, + bool connected, void *context ATTR_UNUSED) { if (connected) clients_notify_auth_connected(); @@ -375,7 +375,7 @@ closelog(); } -int main(int argc __attr_unused__, char *argv[], char *envp[]) +int main(int argc ATTR_UNUSED, char *argv[], char *envp[]) { const char *group_name; struct ip_addr remote_ip, local_ip;
--- a/src/login-common/master.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/login-common/master.c Sun Sep 16 11:40:56 2007 +0300 @@ -230,7 +230,7 @@ return fd; } -static void master_input(void *context __attr_unused__) +static void master_input(void *context ATTR_UNUSED) { int ret;
--- a/src/login-common/ssl-proxy-gnutls.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/login-common/ssl-proxy-gnutls.c Sun Sep 16 11:40:56 2007 +0300 @@ -466,7 +466,7 @@ (void)close(fd); } -static void gcrypt_log_handler(void *context __attr_unused__, int level, +static void gcrypt_log_handler(void *context ATTR_UNUSED, int level, const char *fmt, va_list args) { if (level == GCRY_LOG_FATAL) {
--- a/src/login-common/ssl-proxy-openssl.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/login-common/ssl-proxy-openssl.c Sun Sep 16 11:40:56 2007 +0300 @@ -579,13 +579,13 @@ main_listen_start(); } -static RSA *ssl_gen_rsa_key(SSL *ssl __attr_unused__, - int is_export __attr_unused__, int keylength) +static RSA *ssl_gen_rsa_key(SSL *ssl ATTR_UNUSED, + int is_export ATTR_UNUSED, int keylength) { return RSA_generate_key(keylength, RSA_F4, NULL, NULL); } -static DH *ssl_tmp_dh_callback(SSL *ssl __attr_unused__, +static DH *ssl_tmp_dh_callback(SSL *ssl ATTR_UNUSED, int is_export, int keylength) { /* Well, I'm not exactly sure why the logic in here is this. @@ -645,7 +645,7 @@ } static int -pem_password_callback(char *buf, int size, int rwflag __attr_unused__, +pem_password_callback(char *buf, int size, int rwflag ATTR_UNUSED, void *userdata) { if (userdata == NULL) {
--- a/src/login-common/ssl-proxy.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/login-common/ssl-proxy.c Sun Sep 16 11:40:56 2007 +0300 @@ -9,29 +9,29 @@ /* no SSL support */ -int ssl_proxy_new(int fd __attr_unused__, struct ip_addr *ip __attr_unused__, - struct ssl_proxy **proxy_r __attr_unused__) +int ssl_proxy_new(int fd ATTR_UNUSED, struct ip_addr *ip ATTR_UNUSED, + struct ssl_proxy **proxy_r ATTR_UNUSED) { i_error("Dovecot wasn't built with SSL support"); return -1; } -bool ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy __attr_unused__) +bool ssl_proxy_has_valid_client_cert(struct ssl_proxy *proxy ATTR_UNUSED) { return FALSE; } -const char *ssl_proxy_get_peer_name(struct ssl_proxy *proxy __attr_unused__) +const char *ssl_proxy_get_peer_name(struct ssl_proxy *proxy ATTR_UNUSED) { return NULL; } -bool ssl_proxy_is_handshaked(struct ssl_proxy *proxy __attr_unused__) +bool ssl_proxy_is_handshaked(struct ssl_proxy *proxy ATTR_UNUSED) { return FALSE; } -void ssl_proxy_free(struct ssl_proxy *proxy __attr_unused__) {} +void ssl_proxy_free(struct ssl_proxy *proxy ATTR_UNUSED) {} unsigned int ssl_proxy_get_count(void) {
--- a/src/master/auth-process.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/auth-process.c Sun Sep 16 11:40:56 2007 +0300 @@ -760,7 +760,7 @@ } static void -auth_processes_start_missing(void *context __attr_unused__) +auth_processes_start_missing(void *context ATTR_UNUSED) { struct auth_process_group *group; unsigned int count;
--- a/src/master/child-process.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/child-process.c Sun Sep 16 11:40:56 2007 +0300 @@ -105,8 +105,8 @@ return NULL; } -static void sigchld_handler(int signo __attr_unused__, - void *context __attr_unused__) +static void sigchld_handler(int signo ATTR_UNUSED, + void *context ATTR_UNUSED) { struct child_process *process; const char *process_type_name, *msg;
--- a/src/master/dict-process.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/dict-process.c Sun Sep 16 11:40:56 2007 +0300 @@ -159,8 +159,8 @@ static void dict_process_destroyed(struct child_process *process, - pid_t pid __attr_unused__, - bool abnormal_exit __attr_unused__) + pid_t pid ATTR_UNUSED, + bool abnormal_exit ATTR_UNUSED) { struct dict_process *p = (struct dict_process *)process;
--- a/src/master/log.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/log.c Sun Sep 16 11:40:56 2007 +0300 @@ -254,7 +254,7 @@ i_free(log_io); } -static void log_throttle_timeout(void *context __attr_unused__) +static void log_throttle_timeout(void *context ATTR_UNUSED) { struct log_io *log, *next; unsigned int left = throttle_count;
--- a/src/master/login-process.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/login-process.c Sun Sep 16 11:40:56 2007 +0300 @@ -707,7 +707,7 @@ static void login_process_destroyed(struct child_process *process, - pid_t pid __attr_unused__, bool abnormal_exit) + pid_t pid ATTR_UNUSED, bool abnormal_exit) { struct login_process *p = (struct login_process *)process; @@ -822,7 +822,7 @@ } static void -login_processes_start_missing(void *context __attr_unused__) +login_processes_start_missing(void *context ATTR_UNUSED) { struct login_group *group; @@ -894,7 +894,7 @@ return TRUE; } -static void inetd_login_accept(void *context __attr_unused__) +static void inetd_login_accept(void *context ATTR_UNUSED) { struct login_process *p; int fd;
--- a/src/master/mail-process.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/mail-process.c Sun Sep 16 11:40:56 2007 +0300 @@ -835,7 +835,7 @@ static void mail_process_destroyed(struct child_process *process, - pid_t pid, bool abnormal_exit __attr_unused__) + pid_t pid, bool abnormal_exit ATTR_UNUSED) { struct mail_process_group *group = (struct mail_process_group *)process; const pid_t *pids;
--- a/src/master/mail-process.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/mail-process.h Sun Sep 16 11:40:56 2007 +0300 @@ -7,7 +7,7 @@ struct auth_master_reply; void mail_process_exec(const char *protocol, const char *section) - __attr_noreturn__; + ATTR_NORETURN; enum master_login_status
--- a/src/master/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -84,7 +84,7 @@ } } -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -93,14 +93,14 @@ io_loop_stop(ioloop); } -static void sig_reload_settings(int signo __attr_unused__, - void *context __attr_unused__) +static void sig_reload_settings(int signo ATTR_UNUSED, + void *context ATTR_UNUSED) { settings_reload(); } -static void sig_reopen_logs(int signo __attr_unused__, - void *context __attr_unused__) +static void sig_reopen_logs(int signo ATTR_UNUSED, + void *context ATTR_UNUSED) { set_logfile(settings_root->defaults); }
--- a/src/master/master-settings.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/master-settings.c Sun Sep 16 11:40:56 2007 +0300 @@ -1382,7 +1382,7 @@ } static void -settings_warn_needed_fds(struct server_settings *server __attr_unused__) +settings_warn_needed_fds(struct server_settings *server ATTR_UNUSED) { #ifdef HAVE_SETRLIMIT struct rlimit rlim;
--- a/src/master/ssl-init-main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/ssl-init-main.c Sun Sep 16 11:40:56 2007 +0300 @@ -55,7 +55,7 @@ return 0; } #else -static int generate_parameters_file(const char *fname __attr_unused__) +static int generate_parameters_file(const char *fname ATTR_UNUSED) { i_fatal("Dovecot built without SSL support"); return -1;
--- a/src/master/ssl-init.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/master/ssl-init.c Sun Sep 16 11:40:56 2007 +0300 @@ -66,8 +66,8 @@ } static void -ssl_parameter_process_destroyed(struct child_process *process __attr_unused__, - pid_t pid __attr_unused__, bool abnormal_exit) +ssl_parameter_process_destroyed(struct child_process *process ATTR_UNUSED, + pid_t pid ATTR_UNUSED, bool abnormal_exit) { if (!abnormal_exit) { if (file_copy(SSL_PARAMETERS_PERM_PATH, @@ -152,7 +152,7 @@ } } -static void check_parameters_file_timeout(void *context __attr_unused__) +static void check_parameters_file_timeout(void *context ATTR_UNUSED) { ssl_check_parameters_file(); } @@ -177,7 +177,7 @@ #else -void ssl_parameter_process_destroyed(bool abnormal_exit __attr_unused__) {} +void ssl_parameter_process_destroyed(bool abnormal_exit ATTR_UNUSED) {} void ssl_check_parameters_file(void) {} void ssl_init(void) {} void ssl_deinit(void) {}
--- a/src/plugins/acl/acl-backend-vfile.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/acl/acl-backend-vfile.c Sun Sep 16 11:40:56 2007 +0300 @@ -535,9 +535,9 @@ } static int -acl_backend_vfile_object_update(struct acl_object *aclobj __attr_unused__, +acl_backend_vfile_object_update(struct acl_object *aclobj ATTR_UNUSED, const struct acl_rights_update *rights - __attr_unused__) + ATTR_UNUSED) { /* FIXME */ return -1;
--- a/src/plugins/fts-lucene/fts-backend-lucene.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/fts-lucene/fts-backend-lucene.c Sun Sep 16 11:40:56 2007 +0300 @@ -157,20 +157,20 @@ } static void -fts_backend_lucene_expunge_finish(struct fts_backend *_backend __attr_unused__, - struct mailbox *box __attr_unused__, - bool committed __attr_unused__) +fts_backend_lucene_expunge_finish(struct fts_backend *_backend ATTR_UNUSED, + struct mailbox *box ATTR_UNUSED, + bool committed ATTR_UNUSED) { } static int -fts_backend_lucene_lock(struct fts_backend *_backend __attr_unused__) +fts_backend_lucene_lock(struct fts_backend *_backend ATTR_UNUSED) { return 1; } static void -fts_backend_lucene_unlock(struct fts_backend *_backend __attr_unused__) +fts_backend_lucene_unlock(struct fts_backend *_backend ATTR_UNUSED) { }
--- a/src/plugins/fts-squat/fts-backend-squat.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/fts-squat/fts-backend-squat.c Sun Sep 16 11:40:56 2007 +0300 @@ -83,7 +83,7 @@ static int fts_backend_squat_build_more(struct fts_backend_build_context *_ctx, uint32_t uid, const unsigned char *data, - size_t size, bool headers __attr_unused__) + size_t size, bool headers ATTR_UNUSED) { struct squat_fts_backend_build_context *ctx = (struct squat_fts_backend_build_context *)_ctx; @@ -104,8 +104,8 @@ } static void -fts_backend_squat_expunge(struct fts_backend *_backend __attr_unused__, - struct mail *mail __attr_unused__) +fts_backend_squat_expunge(struct fts_backend *_backend ATTR_UNUSED, + struct mail *mail ATTR_UNUSED) { } @@ -178,7 +178,7 @@ static int fts_backend_squat_lookup(struct fts_backend *_backend, - enum fts_lookup_flags flags __attr_unused__, + enum fts_lookup_flags flags ATTR_UNUSED, const char *key, ARRAY_TYPE(seq_range) *result) { struct squat_fts_backend *backend = @@ -189,7 +189,7 @@ static int fts_backend_squat_filter(struct fts_backend *_backend, - enum fts_lookup_flags flags __attr_unused__, + enum fts_lookup_flags flags ATTR_UNUSED, const char *key, ARRAY_TYPE(seq_range) *result) { struct squat_fts_backend *backend =
--- a/src/plugins/fts-squat/squat-test.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/fts-squat/squat-test.c Sun Sep 16 11:40:56 2007 +0300 @@ -29,7 +29,7 @@ printf("\n"); } -int main(int argc __attr_unused__, char *argv[]) +int main(int argc ATTR_UNUSED, char *argv[]) { struct squat_trie *trie; struct squat_trie_build_context *build_ctx;
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c Sun Sep 16 11:40:56 2007 +0300 @@ -134,7 +134,7 @@ unsigned int dir_len; }; -static int lazy_expunge_move(struct maildir_mailbox *mbox __attr_unused__, +static int lazy_expunge_move(struct maildir_mailbox *mbox ATTR_UNUSED, const char *path, void *context) { struct lazy_expunge_move_context *ctx = context;
--- a/src/plugins/quota/quota-dict.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/quota/quota-dict.c Sun Sep 16 11:40:56 2007 +0300 @@ -62,7 +62,7 @@ } static const char *const * -dict_quota_root_get_resources(struct quota_root *root __attr_unused__) +dict_quota_root_get_resources(struct quota_root *root ATTR_UNUSED) { static const char *resources[] = { QUOTA_NAME_STORAGE_KILOBYTES, QUOTA_NAME_MESSAGES, NULL @@ -96,7 +96,7 @@ static int dict_quota_get_resource(struct quota_root *_root, const char *name, - uint64_t *value_r, uint64_t *limit __attr_unused__) + uint64_t *value_r, uint64_t *limit ATTR_UNUSED) { struct dict_quota_root *root = (struct dict_quota_root *)_root; const char *value;
--- a/src/plugins/quota/quota-dirsize.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/quota/quota-dirsize.c Sun Sep 16 11:40:56 2007 +0300 @@ -32,7 +32,7 @@ } static const char *const * -dirsize_quota_root_get_resources(struct quota_root *root __attr_unused__) +dirsize_quota_root_get_resources(struct quota_root *root ATTR_UNUSED) { static const char *resources[] = { QUOTA_NAME_STORAGE_KILOBYTES, NULL }; @@ -185,7 +185,7 @@ static int dirsize_quota_get_resource(struct quota_root *_root, const char *name, - uint64_t *value_r, uint64_t *limit __attr_unused__) + uint64_t *value_r, uint64_t *limit ATTR_UNUSED) { if (strcasecmp(name, QUOTA_NAME_STORAGE_BYTES) != 0) return 0; @@ -197,8 +197,8 @@ } static int -dirsize_quota_update(struct quota_root *root __attr_unused__, - struct quota_transaction_context *ctx __attr_unused__) +dirsize_quota_update(struct quota_root *root ATTR_UNUSED, + struct quota_transaction_context *ctx ATTR_UNUSED) { return 0; }
--- a/src/plugins/quota/quota-fs.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/quota/quota-fs.c Sun Sep 16 11:40:56 2007 +0300 @@ -583,8 +583,8 @@ } static int -fs_quota_update(struct quota_root *root __attr_unused__, - struct quota_transaction_context *ctx __attr_unused__) +fs_quota_update(struct quota_root *root ATTR_UNUSED, + struct quota_transaction_context *ctx ATTR_UNUSED) { return 0; }
--- a/src/plugins/quota/quota-maildir.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/quota/quota-maildir.c Sun Sep 16 11:40:56 2007 +0300 @@ -604,7 +604,7 @@ } static bool -maildir_quota_parse_rule(struct quota_root *root __attr_unused__, +maildir_quota_parse_rule(struct quota_root *root ATTR_UNUSED, struct quota_rule *rule, const char *str, const char **error_r) { @@ -659,7 +659,7 @@ } static const char *const * -maildir_quota_root_get_resources(struct quota_root *root __attr_unused__) +maildir_quota_root_get_resources(struct quota_root *root ATTR_UNUSED) { static const char *resources_both[] = { QUOTA_NAME_STORAGE_KILOBYTES, @@ -672,7 +672,7 @@ static int maildir_quota_get_resource(struct quota_root *_root, const char *name, - uint64_t *value_r, uint64_t *limit __attr_unused__) + uint64_t *value_r, uint64_t *limit ATTR_UNUSED) { struct maildir_quota_root *root = (struct maildir_quota_root *)_root;
--- a/src/plugins/quota/quota.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/quota/quota.c Sun Sep 16 11:40:56 2007 +0300 @@ -549,9 +549,9 @@ (*limit_r == 0 ? 0 : 1); } -int quota_set_resource(struct quota_root *root __attr_unused__, - const char *name __attr_unused__, - uint64_t value __attr_unused__, const char **error_r) +int quota_set_resource(struct quota_root *root ATTR_UNUSED, + const char *name ATTR_UNUSED, + uint64_t value ATTR_UNUSED, const char **error_r) { /* the quota information comes from userdb (or even config file), so there's really no way to support this until some major changes
--- a/src/plugins/zlib/istream-zlib.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/plugins/zlib/istream-zlib.c Sun Sep 16 11:40:56 2007 +0300 @@ -31,7 +31,7 @@ } } -static void _destroy(struct _iostream *stream __attr_unused__) +static void _destroy(struct _iostream *stream ATTR_UNUSED) { struct _istream *_stream = (struct _istream *) stream;
--- a/src/pop3-login/client-authenticate.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3-login/client-authenticate.c Sun Sep 16 11:40:56 2007 +0300 @@ -23,7 +23,7 @@ const char *capability_string = POP3_CAPABILITY_REPLY; -bool cmd_capa(struct pop3_client *client, const char *args __attr_unused__) +bool cmd_capa(struct pop3_client *client, const char *args ATTR_UNUSED) { const struct auth_mech_desc *mech; unsigned int i, count;
--- a/src/pop3-login/client.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3-login/client.c Sun Sep 16 11:40:56 2007 +0300 @@ -464,7 +464,7 @@ client_destroy(client, "Disconnected: Inactivity"); } -static void idle_timeout(void *context __attr_unused__) +static void idle_timeout(void *context ATTR_UNUSED) { struct hash_iterate_context *iter; void *key, *value;
--- a/src/pop3/client.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3/client.c Sun Sep 16 11:40:56 2007 +0300 @@ -452,7 +452,7 @@ return client->cmd == NULL; } -static void idle_timeout(void *context __attr_unused__) +static void idle_timeout(void *context ATTR_UNUSED) { if (my_client == NULL) return;
--- a/src/pop3/client.h Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3/client.h Sun Sep 16 11:40:56 2007 +0300 @@ -57,7 +57,7 @@ /* Send a line of data to client */ int client_send_line(struct client *client, const char *fmt, ...) - __attr_format__(2, 3); + ATTR_FORMAT(2, 3); void client_send_storage_error(struct client *client); void clients_init(void);
--- a/src/pop3/commands.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3/commands.c Sun Sep 16 11:40:56 2007 +0300 @@ -87,7 +87,7 @@ return args; } -static int cmd_capa(struct client *client, const char *args __attr_unused__) +static int cmd_capa(struct client *client, const char *args ATTR_UNUSED) { client_send_line(client, "+OK\r\n"POP3_CAPABILITY_REPLY"."); return 1; @@ -170,13 +170,13 @@ return 1; } -static int cmd_last(struct client *client, const char *args __attr_unused__) +static int cmd_last(struct client *client, const char *args ATTR_UNUSED) { client_send_line(client, "+OK %u", client->last_seen); return 1; } -static int cmd_noop(struct client *client, const char *args __attr_unused__) +static int cmd_noop(struct client *client, const char *args ATTR_UNUSED) { client_send_line(client, "+OK"); return 1; @@ -220,7 +220,7 @@ return mailbox_search_deinit(&ctx) == 0; } -static int cmd_quit(struct client *client, const char *args __attr_unused__) +static int cmd_quit(struct client *client, const char *args ATTR_UNUSED) { if (client->deleted) { if (!expunge_mails(client)) { @@ -426,7 +426,7 @@ return 1; } -static int cmd_rset(struct client *client, const char *args __attr_unused__) +static int cmd_rset(struct client *client, const char *args ATTR_UNUSED) { struct mail_search_context *search_ctx; struct mail *mail; @@ -469,7 +469,7 @@ return 1; } -static int cmd_stat(struct client *client, const char *args __attr_unused__) +static int cmd_stat(struct client *client, const char *args ATTR_UNUSED) { client_send_line(client, "+OK %u %"PRIuUOFF_T, client-> messages_count - client->deleted_count,
--- a/src/pop3/main.c Sun Sep 16 11:31:27 2007 +0300 +++ b/src/pop3/main.c Sun Sep 16 11:40:56 2007 +0300 @@ -51,7 +51,7 @@ const char *uidl_format, *logout_format; enum uidl_keys uidl_keymask; -static void sig_die(int signo, void *context __attr_unused__) +static void sig_die(int signo, void *context ATTR_UNUSED) { /* warn about being killed because of some signal, except SIGINT (^C) which is too common at least while testing :) */ @@ -60,7 +60,7 @@ io_loop_stop(ioloop); } -static void log_error_callback(void *context __attr_unused__) +static void log_error_callback(void *context ATTR_UNUSED) { io_loop_stop(ioloop); } @@ -250,7 +250,7 @@ closelog(); } -int main(int argc __attr_unused__, char *argv[], char *envp[]) +int main(int argc ATTR_UNUSED, char *argv[], char *envp[]) { #ifdef DEBUG if (getenv("LOGGED_IN") != NULL && getenv("GDB") == NULL)