dovecot: Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to...

dovecot at dovecot.org dovecot at dovecot.org
Sun Sep 16 13:53:12 EEST 2007


details:   http://hg.dovecot.org/dovecot/rev/6a64e64fa3a3
changeset: 6411:6a64e64fa3a3
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 16 11:40:56 2007 +0300
description:
Renamed __attr_*__ to ATTR_*. Renamed __attrs_used__ to ATTRS_DEFINED.

diffstat:

146 files changed, 447 insertions(+), 447 deletions(-)
src/auth/auth-cache.c                           |    4 -
src/auth/auth-request-handler.c                 |    2 
src/auth/auth-request.c                         |    6 +-
src/auth/auth-request.h                         |    6 +-
src/auth/auth-worker-server.c                   |    2 
src/auth/db-ldap.c                              |    4 -
src/auth/db-passwd-file.c                       |    2 
src/auth/main.c                                 |    4 -
src/auth/mech-cram-md5.c                        |    4 -
src/auth/mech-digest-md5.c                      |    4 -
src/auth/mech-winbind.c                         |    4 -
src/auth/passdb-bsdauth.c                       |    2 
src/auth/passdb-checkpassword.c                 |    6 +-
src/auth/passdb-ldap.c                          |    4 -
src/auth/passdb-passwd-file.c                   |    2 
src/auth/passdb-passwd.c                        |    2 
src/auth/passdb-shadow.c                        |    2 
src/auth/passdb-sia.c                           |    8 +--
src/auth/passdb-sql.c                           |    4 -
src/auth/passdb-vpopmail.c                      |    2 
src/auth/password-scheme.c                      |   36 +++++++--------
src/auth/userdb-ldap.c                          |    2 
src/auth/userdb-passwd-file.c                   |    2 
src/auth/userdb-sql.c                           |    2 
src/auth/userdb-static.c                        |    4 -
src/deliver/deliver.c                           |    2 
src/deliver/smtp-client.c                       |    2 
src/dict/main.c                                 |    4 -
src/imap-login/client.c                         |    2 
src/imap/client.c                               |    2 
src/imap/imap-fetch-body.c                      |   12 ++---
src/imap/imap-fetch.c                           |   24 +++++-----
src/imap/mail-storage-callbacks.c               |    4 -
src/imap/main.c                                 |    6 +-
src/lib-charset/charset-utf8.c                  |    4 -
src/lib-dict/dict-db.c                          |    8 +--
src/lib-dict/dict-sql.c                         |    2 
src/lib-imap/imap-parser.c                      |    6 +-
src/lib-imap/imap-parser.h                      |    6 +-
src/lib-index/mail-cache-sync-update.c          |    4 -
src/lib-index/mail-cache.h                      |    2 
src/lib-index/mail-index-dummy-view.c           |    4 -
src/lib-index/mail-index-fsck.c                 |    2 
src/lib-index/mail-index-private.h              |    2 
src/lib-index/mail-index-sync-private.h         |    2 
src/lib-index/mail-index-view.c                 |    4 -
src/lib-index/mail-transaction-log-private.h    |    2 
src/lib-index/mail-transaction-log.h            |    2 
src/lib-mail/istream-header-filter.c            |    8 +--
src/lib-mail/message-parser.c                   |    4 -
src/lib-sql/driver-mysql.c                      |    4 -
src/lib-sql/driver-pgsql.c                      |    4 -
src/lib-sql/driver-sqlite.c                     |    6 +-
src/lib-sql/sql-api.c                           |    8 +--
src/lib-storage/index/cydir/cydir-save.c        |    4 -
src/lib-storage/index/cydir/cydir-storage.c     |    4 -
src/lib-storage/index/dbox/dbox-save.c          |    4 -
src/lib-storage/index/dbox/dbox-storage.c       |    4 -
src/lib-storage/index/index-search.c            |    4 -
src/lib-storage/index/index-storage.c           |    2 
src/lib-storage/index/maildir/maildir-save.c    |    4 -
src/lib-storage/index/maildir/maildir-storage.c |    6 +-
src/lib-storage/index/maildir/maildir-util.c    |    2 
src/lib-storage/index/mbox/istream-raw-mbox.c   |    4 -
src/lib-storage/index/mbox/mbox-lock.c          |    4 -
src/lib-storage/index/mbox/mbox-save.c          |    2 
src/lib-storage/index/mbox/mbox-sync-private.h  |    2 
src/lib-storage/list/mailbox-list-fs.c          |    2 
src/lib-storage/list/mailbox-list-maildir.c     |    8 +--
src/lib-storage/mail-storage-private.h          |    2 
src/lib-storage/mailbox-list-private.h          |    2 
src/lib-storage/mailbox-list.c                  |    2 
src/lib/backtrace-string.c                      |    4 -
src/lib/data-stack.c                            |    2 
src/lib/data-stack.h                            |    4 -
src/lib/failures.c                              |   52 +++++++++++------------
src/lib/failures.h                              |   26 +++++------
src/lib/fdpass.c                                |    8 +--
src/lib/imem.h                                  |   18 +++----
src/lib/ioloop-notify-dn.c                      |    4 -
src/lib/ioloop-notify-none.c                    |   12 ++---
src/lib/istream-data.c                          |    8 +--
src/lib/istream-file.c                          |    4 -
src/lib/istream-limit.c                         |    4 -
src/lib/istream-mmap.c                          |    4 -
src/lib/istream-seekable.c                      |    4 -
src/lib/istream-tee.c                           |    6 +-
src/lib/istream.c                               |    2 
src/lib/lib-signals.c                           |    4 -
src/lib/macros.h                                |   40 ++++++++---------
src/lib/mempool-alloconly.c                     |    4 -
src/lib/mempool-datastack.c                     |   10 ++--
src/lib/mempool-system-clean.c                  |   18 +++----
src/lib/mempool-system.c                        |   20 ++++----
src/lib/mempool-unsafe-datastack.c              |   18 +++----
src/lib/mempool.h                               |    2 
src/lib/mmap-anon.c                             |    4 -
src/lib/mmap-util.c                             |    4 -
src/lib/mmap-util.h                             |    2 
src/lib/module-dir.c                            |   16 +++----
src/lib/network.c                               |    2 
src/lib/nfs-workarounds.c                       |    4 -
src/lib/ostream-crlf.c                          |    2 
src/lib/printf-format-fix.h                     |    6 +-
src/lib/process-title.c                         |    6 +-
src/lib/restrict-process-size.c                 |    4 -
src/lib/sendfile-util.c                         |    6 +-
src/lib/str.h                                   |    4 -
src/lib/strfuncs.h                              |   44 +++++++++----------
src/lib/utc-offset.c                            |    2 
src/lib/var-expand.c                            |   14 +++---
src/login-common/main.c                         |    8 +--
src/login-common/master.c                       |    2 
src/login-common/ssl-proxy-gnutls.c             |    2 
src/login-common/ssl-proxy-openssl.c            |    8 +--
src/login-common/ssl-proxy.c                    |   12 ++---
src/master/auth-process.c                       |    2 
src/master/child-process.c                      |    4 -
src/master/dict-process.c                       |    4 -
src/master/log.c                                |    2 
src/master/login-process.c                      |    6 +-
src/master/mail-process.c                       |    2 
src/master/mail-process.h                       |    2 
src/master/main.c                               |   10 ++--
src/master/master-settings.c                    |    2 
src/master/ssl-init-main.c                      |    2 
src/master/ssl-init.c                           |    8 +--
src/plugins/acl/acl-backend-vfile.c             |    4 -
src/plugins/fts-lucene/fts-backend-lucene.c     |   18 +++----
src/plugins/fts-squat/fts-backend-squat.c       |   10 ++--
src/plugins/fts-squat/squat-test.c              |    2 
src/plugins/lazy-expunge/lazy-expunge-plugin.c  |    2 
src/plugins/quota/quota-dict.c                  |    4 -
src/plugins/quota/quota-dirsize.c               |    8 +--
src/plugins/quota/quota-fs.c                    |    4 -
src/plugins/quota/quota-maildir.c               |    6 +-
src/plugins/quota/quota.c                       |    6 +-
src/plugins/zlib/istream-zlib.c                 |    2 
src/pop3-login/client-authenticate.c            |    2 
src/pop3-login/client.c                         |    2 
src/pop3/client.c                               |    2 
src/pop3/client.h                               |    2 
src/pop3/commands.c                             |   12 ++---
src/pop3/main.c                                 |    6 +-
src/util/dovecotpw.c                            |    2 
src/util/listview.c                             |    2 

diffs (truncated from 3469 to 300 lines):

diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/auth-cache.c
--- 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 @@ auth_cache_node_destroy(struct auth_cach
 	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 @@ static void sig_auth_cache_clear(int sig
 	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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/auth-request-handler.c
--- 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 @@ void auth_request_handler_flush_failures
 	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();
 }
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/auth-request.c
--- 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 @@ int auth_request_password_verify(struct 
 
 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 @@ auth_request_get_var_expand_table(const 
 	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)
 {
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/auth-request.h
--- 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 @@ const char *auth_request_str_escape(cons
 
 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);
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/auth-worker-server.c
--- 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 @@ void auth_worker_call(struct auth_reques
 		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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/db-ldap.c
--- 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 @@ static void ldap_input(struct ldap_conne
 
 #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 @@ db_ldap_value_get_var_expand_table(struc
 	((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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/db-passwd-file.c
--- 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 @@ void db_passwd_file_unref(struct db_pass
 
 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;
 
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/main.c
--- 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 *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 @@ static void main_deinit(void)
 	closelog();
 }
 
-int main(int argc __attr_unused__, char *argv[])
+int main(int argc ATTR_UNUSED, char *argv[])
 {
 	bool foreground = FALSE;
 
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/mech-cram-md5.c
--- 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 @@ mech_cram_md5_auth_continue(struct auth_
 
 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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/mech-digest-md5.c
--- 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 @@ mech_digest_md5_auth_continue(struct aut
 
 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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/mech-winbind.c
--- 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 @@ static void winbind_wait_pid(struct winb
 	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);
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-bsdauth.c
--- 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 @@ bsdauth_preinit(struct auth_passdb *auth
 	return module;
 }
 
-static void bsdauth_deinit(struct passdb_module *module __attr_unused__)
+static void bsdauth_deinit(struct passdb_module *module ATTR_UNUSED)
 {
 	endpwent();
 }
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-checkpassword.c
--- 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 @@ checkpassword_request_half_finish(struct
 	}
 }
 
-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 env_put_extra_fields(const c
 	}
 }
 
-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 @@ checkpassword_preinit(struct auth_passdb
 }
 
 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);
 }
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-ldap.c
--- 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 @@ ldap_verify_plain_authbind(struct auth_r
 
 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 @@ passdb_ldap_preinit(struct auth_passdb *
 }
 
 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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-passwd-file.c
--- 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 @@ passwd_file_preinit(struct auth_passdb *
 }
 
 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;
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-passwd.c
--- 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 @@ static void passwd_init(struct passdb_mo
 	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();
 }
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-shadow.c
--- 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 @@ static void shadow_init(struct passdb_mo
 	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();
 }
diff -r e4eb71ae8e96 -r 6a64e64fa3a3 src/auth/passdb-sia.c
--- 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__)


More information about the dovecot-cvs mailing list