dovecot-2.2: Array API changed: ARRAY_DEFINE(name, type) -> ARRA...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Aug 19 14:21:52 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/a097ef0a9d6d
changeset: 14920:a097ef0a9d6d
user: Timo Sirainen <tss at iki.fi>
date: Sun Aug 19 14:21:37 2012 +0300
description:
Array API changed: ARRAY_DEFINE(name, type) -> ARRAY(type) name
Easy way to update your existing code:
perl -i -pe 's:ARRAY_DEFINE\(([^,]+), *([^)]+)\);:ARRAY($2) $1;:' **/*.[ch]
diffstat:
src/auth/auth-request-handler.c | 2 +-
src/auth/auth-settings.c | 2 +-
src/auth/auth-settings.h | 4 +-
src/auth/auth-worker-server.c | 4 +-
src/auth/auth.c | 2 +-
src/auth/db-ldap.h | 2 +-
src/auth/main.c | 2 +-
src/auth/passdb-template.c | 2 +-
src/auth/passdb.c | 4 +-
src/auth/userdb-template.c | 2 +-
src/auth/userdb.c | 4 +-
src/config/config-parser-private.h | 2 +-
src/config/config-parser.c | 2 +-
src/dict/dict-connection.h | 2 +-
src/dict/dict-settings.h | 2 +-
src/director/director-test.c | 2 +-
src/director/director.h | 6 +-
src/director/mail-host.c | 2 +-
src/director/main.c | 2 +-
src/director/user-directory.c | 2 +-
src/doveadm/doveadm-dump.c | 2 +-
src/doveadm/doveadm-kick.c | 4 +-
src/doveadm/doveadm-mail-altmove.c | 2 +-
src/doveadm/doveadm-mail-fetch.c | 2 +-
src/doveadm/doveadm-mail.h | 2 +-
src/doveadm/doveadm-print-flow.c | 2 +-
src/doveadm/doveadm-print-pager.c | 2 +-
src/doveadm/doveadm-print-table.c | 2 +-
src/doveadm/doveadm-print.c | 2 +-
src/doveadm/doveadm-server.h | 2 +-
src/doveadm/doveadm-settings.h | 2 +-
src/doveadm/doveadm-stats.c | 2 +-
src/doveadm/doveadm-who.c | 4 +-
src/doveadm/doveadm.c | 2 +-
src/doveadm/dsync/dsync-mailbox-export.c | 2 +-
src/doveadm/dsync/dsync-mailbox-import.c | 6 +-
src/doveadm/dsync/dsync-mailbox-tree-private.h | 2 +-
src/doveadm/dsync/dsync-mailbox-tree-sync.c | 4 +-
src/doveadm/dsync/dsync-slave-pipe.c | 4 +-
src/imap/cmd-list.c | 6 +-
src/imap/imap-client.h | 6 +-
src/imap/imap-commands-util.c | 2 +-
src/imap/imap-commands.c | 2 +-
src/imap/imap-fetch.c | 2 +-
src/imap/imap-fetch.h | 2 +-
src/imap/imap-notify.h | 4 +-
src/imap/imap-search.h | 2 +-
src/indexer/worker-connection.c | 2 +-
src/ipc/ipc-connection.h | 2 +-
src/ipc/ipc-group.c | 2 +-
src/lib-auth/auth-server-connection.h | 2 +-
src/lib-dict/dict-memcached-ascii.c | 4 +-
src/lib-dict/dict-redis.c | 4 +-
src/lib-dict/dict-sql-settings.c | 2 +-
src/lib-dict/dict-sql-settings.h | 2 +-
src/lib-dict/dict-sql.c | 2 +-
src/lib-dict/dict-transaction-memory.h | 2 +-
src/lib-dict/dict.c | 2 +-
src/lib-imap-client/imapc-client-private.h | 2 +-
src/lib-imap-client/imapc-connection.c | 4 +-
src/lib-index/mail-cache-compress.c | 2 +-
src/lib-index/mail-cache-lookup.c | 2 +-
src/lib-index/mail-cache-transaction.c | 4 +-
src/lib-index/mail-index-modseq.c | 2 +-
src/lib-index/mail-index-private.h | 14 ++++----
src/lib-index/mail-index-strmap.c | 2 +-
src/lib-index/mail-index-sync-private.h | 4 +-
src/lib-index/mail-index-sync.c | 2 +-
src/lib-index/mail-index-transaction-export.c | 2 +-
src/lib-index/mail-index-transaction-private.h | 25 +++++++--------
src/lib-index/mail-index-transaction-view.c | 2 +-
src/lib-index/mail-index-view-private.h | 4 +-
src/lib-index/mail-transaction-log-view-private.h | 2 +-
src/lib-lda/lmtp-client.c | 2 +-
src/lib-lda/mail-deliver.h | 2 +-
src/lib-mail/istream-attachment-connector.c | 2 +-
src/lib-mail/istream-header-filter.c | 2 +-
src/lib-mail/rfc2231-parser.c | 2 +-
src/lib-mail/test-istream-attachment.c | 2 +-
src/lib-master/anvil-client.c | 2 +-
src/lib-master/ipc-client.c | 2 +-
src/lib-master/master-instance.c | 2 +-
src/lib-master/master-service-settings.c | 2 +-
src/lib-master/mountpoint-list.c | 2 +-
src/lib-settings/settings-parser.c | 2 +-
src/lib-sql/driver-pgsql.c | 2 +-
src/lib-sql/driver-sqlpool.c | 4 +-
src/lib-sql/sql-api-private.h | 2 +-
src/lib-storage/index/dbox-common/dbox-file.h | 2 +-
src/lib-storage/index/dbox-multi/mdbox-map-private.h | 6 +-
src/lib-storage/index/dbox-multi/mdbox-save.c | 2 +-
src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 2 +-
src/lib-storage/index/dbox-multi/mdbox-storage.h | 2 +-
src/lib-storage/index/dbox-single/sdbox-save.c | 2 +-
src/lib-storage/index/imapc/imapc-storage.h | 8 ++--
src/lib-storage/index/index-mail-binary.c | 2 +-
src/lib-storage/index/index-mail-headers.c | 4 +-
src/lib-storage/index/index-mail.h | 6 +-
src/lib-storage/index/index-search-private.h | 2 +-
src/lib-storage/index/index-storage.c | 2 +-
src/lib-storage/index/index-sync-changes.c | 2 +-
src/lib-storage/index/index-thread-finish.c | 4 +-
src/lib-storage/index/maildir/maildir-keywords.c | 2 +-
src/lib-storage/index/maildir/maildir-save.c | 2 +-
src/lib-storage/index/mbox/mbox-sync-private.h | 2 +-
src/lib-storage/list/mailbox-list-fs-iter.c | 6 +-
src/lib-storage/list/mailbox-list-index-notify.c | 4 +-
src/lib-storage/list/mailbox-list-maildir.c | 2 +-
src/lib-storage/mail-search-register-human.c | 2 +-
src/lib-storage/mail-search-register.c | 2 +-
src/lib-storage/mail-storage-hooks.c | 8 +---
src/lib-storage/mail-storage-private.h | 15 ++++-----
src/lib-storage/mail-storage-settings.h | 6 +-
src/lib-storage/mail-user.h | 4 +-
src/lib-storage/mailbox-keywords.c | 2 +-
src/lib-storage/mailbox-list-iter.c | 2 +-
src/lib-storage/mailbox-list-private.h | 5 +-
src/lib-storage/mailbox-list.c | 2 +-
src/lib-storage/mailbox-tree.c | 2 +-
src/lib/array-decl.h | 2 +-
src/lib/array.h | 2 +-
src/lib/ioloop-epoll.c | 4 +-
src/lib/ioloop-kqueue.c | 2 +-
src/lib/ioloop-private.h | 2 +-
src/lib/lib.h | 2 +-
src/lib/module-context.h | 2 +-
src/lib/priorityq.c | 2 +-
src/lib/test-aqueue.c | 2 +-
src/lib/test-array.c | 4 +-
src/lib/var-expand.c | 2 +-
src/lmtp/client.h | 2 +-
src/lmtp/lmtp-proxy.c | 4 +-
src/log/log-connection.c | 2 +-
src/master/service-listen.c | 4 +-
src/master/service-process-notify.c | 2 +-
src/master/service.h | 4 +-
src/plugins/acl/acl-backend-vfile.h | 4 +-
src/plugins/acl/acl-cache.c | 2 +-
src/plugins/expire/doveadm-expire.c | 2 +-
src/plugins/expire/expire-set.c | 2 +-
src/plugins/fts-lucene/fts-backend-lucene.c | 2 +-
src/plugins/fts-lucene/lucene-wrapper.cc | 2 +-
src/plugins/fts-solr/fts-backend-solr-old.c | 2 +-
src/plugins/fts-solr/fts-backend-solr.c | 4 +-
src/plugins/fts-solr/solr-connection.c | 2 +-
src/plugins/fts-squat/squat-trie.c | 2 +-
src/plugins/fts-squat/squat-uidlist.c | 2 +-
src/plugins/fts/fts-api.c | 2 +-
src/plugins/fts/fts-parser-script.c | 2 +-
src/plugins/fts/fts-storage.h | 2 +-
src/plugins/pop3-migration/pop3-migration-plugin.c | 4 +-
src/plugins/quota/quota-private.h | 12 +++---
src/plugins/quota/quota-storage.c | 4 +-
src/plugins/quota/quota.c | 2 +-
src/plugins/trash/trash-plugin.c | 2 +-
src/plugins/virtual/virtual-mail.c | 2 +-
src/plugins/virtual/virtual-search.c | 2 +-
src/plugins/virtual/virtual-storage.h | 2 +-
src/plugins/virtual/virtual-sync.c | 2 +-
src/plugins/virtual/virtual-transaction.h | 3 +-
src/pop3/pop3-client.c | 2 +-
src/pop3/pop3-client.h | 2 +-
src/replication/replicator/replicator-brain.c | 2 +-
src/replication/replicator/replicator-queue.c | 4 +-
src/ssl-params/main.c | 2 +-
165 files changed, 244 insertions(+), 252 deletions(-)
diffs (truncated from 2442 to 300 lines):
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/auth-request-handler.c Sun Aug 19 14:21:37 2012 +0300
@@ -33,7 +33,7 @@
unsigned int destroyed:1;
};
-static ARRAY_DEFINE(auth_failures_arr, struct auth_request *);
+static ARRAY(struct auth_request *) auth_failures_arr;
static struct aqueue *auth_failures;
static struct timeout *to_auth_failures;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/auth-settings.c
--- a/src/auth/auth-settings.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/auth-settings.c Sun Aug 19 14:21:37 2012 +0300
@@ -278,7 +278,7 @@
const char **error_r)
{
const char *const *tmp;
- ARRAY_DEFINE(ips_array, struct ip_addr);
+ ARRAY(struct ip_addr) ips_array;
struct ip_addr *ips;
unsigned int ips_count;
int ret;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/auth-settings.h
--- a/src/auth/auth-settings.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/auth-settings.h Sun Aug 19 14:21:37 2012 +0300
@@ -49,8 +49,8 @@
unsigned int worker_max_count;
- ARRAY_DEFINE(passdbs, struct auth_passdb_settings *);
- ARRAY_DEFINE(userdbs, struct auth_userdb_settings *);
+ ARRAY(struct auth_passdb_settings *) passdbs;
+ ARRAY(struct auth_userdb_settings *) userdbs;
const char *base_dir;
bool verbose_proctitle;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/auth-worker-server.c Sun Aug 19 14:21:37 2012 +0300
@@ -46,9 +46,9 @@
unsigned int shutdown:1;
};
-static ARRAY_DEFINE(connections, struct auth_worker_connection *) = ARRAY_INIT;
+static ARRAY(struct auth_worker_connection *) connections = ARRAY_INIT;
static unsigned int idle_count = 0, auth_workers_with_errors = 0;
-static ARRAY_DEFINE(worker_request_array, struct auth_worker_request *);
+static ARRAY(struct auth_worker_request *) worker_request_array;
static struct aqueue *worker_request_queue;
static time_t auth_worker_last_warn;
static unsigned int auth_workers_throttle_count;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/auth.c
--- a/src/auth/auth.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/auth.c Sun Aug 19 14:21:37 2012 +0300
@@ -16,7 +16,7 @@
.override_fields = ""
};
-static ARRAY_DEFINE(auths, struct auth *);
+static ARRAY(struct auth *) auths;
static void
auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/db-ldap.h
--- a/src/auth/db-ldap.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/db-ldap.h Sun Aug 19 14:21:37 2012 +0300
@@ -149,7 +149,7 @@
/* Request queue contains sent requests at tail (msgid != -1) and
queued requests at head (msgid == -1). */
struct aqueue *request_queue;
- ARRAY_DEFINE(request_array, struct ldap_request *);
+ ARRAY(struct ldap_request *) request_array;
/* Number of messages in queue with msgid != -1 */
unsigned int pending_count;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/main.c
--- a/src/auth/main.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/main.c Sun Aug 19 14:21:37 2012 +0300
@@ -56,7 +56,7 @@
static pool_t auth_set_pool;
static struct module *modules = NULL;
static struct mechanisms_register *mech_reg;
-static ARRAY_DEFINE(listeners, struct auth_socket_listener);
+static ARRAY(struct auth_socket_listener) listeners;
void auth_refresh_proctitle(void)
{
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/passdb-template.c
--- a/src/auth/passdb-template.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/passdb-template.c Sun Aug 19 14:21:37 2012 +0300
@@ -8,7 +8,7 @@
#include "passdb-template.h"
struct passdb_template {
- ARRAY_DEFINE(args, const char *);
+ ARRAY(const char *) args;
};
struct passdb_template *passdb_template_build(pool_t pool, const char *args)
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/passdb.c
--- a/src/auth/passdb.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/passdb.c Sun Aug 19 14:21:37 2012 +0300
@@ -9,8 +9,8 @@
#include <stdlib.h>
-static ARRAY_DEFINE(passdb_interfaces, struct passdb_module_interface *);
-static ARRAY_DEFINE(passdb_modules, struct passdb_module *);
+static ARRAY(struct passdb_module_interface *) passdb_interfaces;
+static ARRAY(struct passdb_module *) passdb_modules;
static const struct passdb_module_interface passdb_iface_deinit = {
.name = "deinit"
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/userdb-template.c
--- a/src/auth/userdb-template.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/userdb-template.c Sun Aug 19 14:21:37 2012 +0300
@@ -8,7 +8,7 @@
#include "userdb-template.h"
struct userdb_template {
- ARRAY_DEFINE(args, const char *);
+ ARRAY(const char *) args;
};
struct userdb_template *
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/auth/userdb.c
--- a/src/auth/userdb.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/auth/userdb.c Sun Aug 19 14:21:37 2012 +0300
@@ -9,8 +9,8 @@
#include <stdlib.h>
-static ARRAY_DEFINE(userdb_interfaces, struct userdb_module_interface *);
-static ARRAY_DEFINE(userdb_modules, struct userdb_module *);
+static ARRAY(struct userdb_module_interface *) userdb_interfaces;
+static ARRAY(struct userdb_module *) userdb_modules;
static const struct userdb_module_interface userdb_iface_deinit = {
.name = "deinit"
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/config/config-parser-private.h
--- a/src/config/config-parser-private.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/config/config-parser-private.h Sun Aug 19 14:21:37 2012 +0300
@@ -41,7 +41,7 @@
const char *path;
const char *module;
- ARRAY_DEFINE(all_parsers, struct config_filter_parser *);
+ ARRAY(struct config_filter_parser *) all_parsers;
struct config_module_parser *root_parsers;
struct config_section_stack *cur_section;
struct input_stack *cur_input;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/config/config-parser.c
--- a/src/config/config-parser.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/config/config-parser.c Sun Aug 19 14:21:37 2012 +0300
@@ -980,7 +980,7 @@
struct module_dir_load_settings mod_set;
struct module *m;
const struct setting_parser_info **roots;
- ARRAY_DEFINE(new_roots, const struct setting_parser_info *);
+ ARRAY(const struct setting_parser_info *) new_roots;
ARRAY_TYPE(service_settings) new_services;
struct service_settings *const *services, *service_set;
unsigned int i, count;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/dict/dict-connection.h
--- a/src/dict/dict-connection.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/dict/dict-connection.h Sun Aug 19 14:21:37 2012 +0300
@@ -27,7 +27,7 @@
/* There are only a few transactions per client, so keeping them in
array is fast enough */
- ARRAY_DEFINE(transactions, struct dict_connection_transaction);
+ ARRAY(struct dict_connection_transaction) transactions;
};
struct dict_connection *dict_connection_create(int fd);
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/dict/dict-settings.h
--- a/src/dict/dict-settings.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/dict/dict-settings.h Sun Aug 19 14:21:37 2012 +0300
@@ -4,7 +4,7 @@
struct dict_settings {
const char *base_dir;
const char *dict_db_config;
- ARRAY_DEFINE(dicts, const char *);
+ ARRAY(const char *) dicts;
};
extern const struct setting_parser_info dict_setting_parser_info;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/director/director-test.c
--- a/src/director/director-test.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/director/director-test.c Sun Aug 19 14:21:37 2012 +0300
@@ -91,7 +91,7 @@
static struct director_connection *director_connections;
static HASH_TABLE(char *, struct user *) users;
static HASH_TABLE(struct ip_addr *, struct host *) hosts;
-static ARRAY_DEFINE(hosts_array, struct host *);
+static ARRAY(struct host *) hosts_array;
static struct admin_connection *admin;
static struct timeout *to_disconnect;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/director/director.h
--- a/src/director/director.h Sun Aug 19 14:01:15 2012 +0300
+++ b/src/director/director.h Sun Aug 19 14:21:37 2012 +0300
@@ -39,7 +39,7 @@
is long. */
struct director_connection *left, *right;
/* all director connections */
- ARRAY_DEFINE(connections, struct director_connection *);
+ ARRAY(struct director_connection *) connections;
struct timeout *to_reconnect;
struct timeout *to_sync;
@@ -52,14 +52,14 @@
struct user_directory *users;
/* these requests are waiting for directors to be in synced */
- ARRAY_DEFINE(pending_requests, struct director_request *);
+ ARRAY(struct director_request *) pending_requests;
struct timeout *to_request;
struct timeout *to_handshake_warning;
director_state_change_callback_t *state_change_callback;
/* director hosts are sorted by IP (and port) */
- ARRAY_DEFINE(dir_hosts, struct director_host *);
+ ARRAY(struct director_host *) dir_hosts;
struct timeout *to_remove_dirs;
struct ipc_client *ipc_proxy;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/director/mail-host.c
--- a/src/director/mail-host.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/director/mail-host.c Sun Aug 19 14:21:37 2012 +0300
@@ -8,7 +8,7 @@
struct mail_host_list {
ARRAY_TYPE(mail_host) hosts;
- ARRAY_DEFINE(vhosts, struct mail_host *);
+ ARRAY(struct mail_host *) vhosts;
bool hosts_unsorted;
};
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/director/main.c
--- a/src/director/main.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/director/main.c Sun Aug 19 14:21:37 2012 +0300
@@ -116,7 +116,7 @@
static void director_state_changed(struct director *dir)
{
struct director_request *const *requestp;
- ARRAY_DEFINE(new_requests, struct director_request *);
+ ARRAY(struct director_request *) new_requests;
bool ret;
if (!dir->ring_synced ||
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/director/user-directory.c
--- a/src/director/user-directory.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/director/user-directory.c Sun Aug 19 14:21:37 2012 +0300
@@ -26,7 +26,7 @@
struct user *head, *tail;
struct user *prev_insert_pos;
- ARRAY_DEFINE(iters, struct user_directory_iter *);
+ ARRAY(struct user_directory_iter *) iters;
char *username_hash_fmt;
unsigned int timeout_secs;
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/doveadm/doveadm-dump.c
--- a/src/doveadm/doveadm-dump.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/doveadm/doveadm-dump.c Sun Aug 19 14:21:37 2012 +0300
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <unistd.h>
-static ARRAY_DEFINE(dumps, const struct doveadm_cmd_dump *);
+static ARRAY(const struct doveadm_cmd_dump *) dumps;
void doveadm_dump_register(const struct doveadm_cmd_dump *dump)
{
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/doveadm/doveadm-kick.c
--- a/src/doveadm/doveadm-kick.c Sun Aug 19 14:01:15 2012 +0300
+++ b/src/doveadm/doveadm-kick.c Sun Aug 19 14:21:37 2012 +0300
@@ -21,7 +21,7 @@
struct kick_pid {
pid_t pid;
- ARRAY_DEFINE(users, struct kick_user);
+ ARRAY(struct kick_user) users;
bool kick;
};
@@ -29,7 +29,7 @@
struct who_context who;
HASH_TABLE(pid_t, struct kick_pid *) pids;
bool force_kick;
- ARRAY_DEFINE(kicked_users, const char *);
+ ARRAY(const char *) kicked_users;
};
static void
diff -r ed0fd7c1e8ff -r a097ef0a9d6d src/doveadm/doveadm-mail-altmove.c
More information about the dovecot-cvs
mailing list