dovecot: Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRA...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Feb 11 20:17:13 EET 2008
details: http://hg.dovecot.org/dovecot/rev/e6693a0ec8e1
changeset: 7226:e6693a0ec8e1
user: Timo Sirainen <tss at iki.fi>
date: Mon Feb 11 20:17:00 2008 +0200
description:
Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
replaced them with T_BEGIN/END calls. T_FRAME() made it difficult to debug
code with gdb.
diffstat:
121 files changed, 471 insertions(+), 481 deletions(-)
src/auth/auth-client-connection.c | 4 +-
src/auth/auth-master-connection.c | 4 +-
src/auth/auth-request.c | 12 +++----
src/auth/auth-worker-client.c | 4 +-
src/auth/auth-worker-server.c | 8 ++---
src/auth/db-ldap.c | 4 +-
src/auth/db-passwd-file.c | 4 +-
src/auth/main.c | 4 +-
src/deliver/deliver.c | 4 +-
src/dict/dict-server.c | 8 ++---
src/imap/client.c | 4 +-
src/imap/cmd-list.c | 12 +++----
src/imap/imap-fetch.c | 4 +-
src/imap/imap-thread.c | 14 ++++-----
src/imap/mail-storage-callbacks.c | 8 ++---
src/lib-auth/auth-server-connection.c | 4 +-
src/lib-auth/auth-server-request.c | 8 ++---
src/lib-dict/dict-client.c | 32 ++++++++++-----------
src/lib-dict/dict-sql.c | 24 +++++++--------
src/lib-dict/dict.c | 4 +-
src/lib-imap/imap-bodystructure.c | 4 +-
src/lib-imap/imap-match.c | 4 +-
src/lib-imap/imap-quote.c | 4 +-
src/lib-index/mail-cache-fields.c | 8 ++---
src/lib-index/mail-cache-lookup.c | 4 +-
src/lib-index/mail-cache-transaction.c | 8 ++---
src/lib-index/mail-cache.c | 4 +-
src/lib-index/mail-index-fsck.c | 4 +-
src/lib-index/mail-index-map.c | 4 +-
src/lib-index/mail-index-sync-update.c | 4 +-
src/lib-index/mail-index-sync.c | 8 ++---
src/lib-index/mail-index-view-sync.c | 4 +-
src/lib-index/mail-transaction-log-append.c | 4 +-
src/lib-index/mail-transaction-log-file.c | 4 +-
src/lib-index/mail-transaction-log-view.c | 8 ++---
src/lib-index/mailbox-list-index-sync.c | 12 +++----
src/lib-index/mailbox-list-index.c | 8 ++---
src/lib-mail/message-address.c | 4 +-
src/lib-mail/message-date.c | 4 +-
src/lib-mail/message-decoder.c | 4 +-
src/lib-mail/message-parser.c | 8 +----
src/lib-mail/message-search.c | 16 +++++-----
src/lib-settings/settings.c | 4 +-
src/lib-sql/driver-mysql.c | 4 +-
src/lib-sql/driver-pgsql.c | 4 +-
src/lib-storage/index/cydir/cydir-save.c | 4 +-
src/lib-storage/index/dbox/dbox-file.c | 20 ++++++-------
src/lib-storage/index/dbox/dbox-index.c | 8 ++---
src/lib-storage/index/dbox/dbox-save.c | 4 +-
src/lib-storage/index/dbox/dbox-sync-file.c | 12 +++----
src/lib-storage/index/dbox/dbox-sync-rebuild.c | 12 +++----
src/lib-storage/index/index-mail-headers.c | 28 +++++++++---------
src/lib-storage/index/index-mail.c | 12 +++----
src/lib-storage/index/index-search.c | 16 +++++-----
src/lib-storage/index/index-sort.c | 12 +++----
src/lib-storage/index/index-storage.c | 4 +-
src/lib-storage/index/maildir/maildir-copy.c | 4 +-
src/lib-storage/index/maildir/maildir-keywords.c | 4 +-
src/lib-storage/index/maildir/maildir-save.c | 26 ++++++++---------
src/lib-storage/index/maildir/maildir-storage.c | 4 +-
src/lib-storage/index/maildir/maildir-sync.c | 20 ++++++-------
src/lib-storage/index/maildir/maildir-uidlist.c | 20 ++++++-------
src/lib-storage/index/maildir/maildir-util.c | 12 +++----
src/lib-storage/index/mbox/mbox-save.c | 13 +++-----
src/lib-storage/index/mbox/mbox-sync-parse.c | 8 ++---
src/lib-storage/index/mbox/mbox-sync-update.c | 10 +++---
src/lib-storage/index/mbox/mbox-sync.c | 4 +-
src/lib-storage/list/index-mailbox-list-sync.c | 4 +-
src/lib-storage/list/mailbox-list-fs-iter.c | 12 +++----
src/lib-storage/list/mailbox-list-maildir-iter.c | 12 +++----
src/lib-storage/list/mailbox-list-maildir.c | 4 +-
src/lib-storage/list/mailbox-list-subscriptions.c | 4 +-
src/lib-storage/mail-namespace.c | 16 +++++-----
src/lib-storage/mail-search.c | 4 +-
src/lib-storage/mail-storage.c | 8 ++---
src/lib-storage/mailbox-list.c | 4 +-
src/lib-storage/mailbox-tree.c | 8 ++---
src/lib/compat.c | 4 +-
src/lib/data-stack.h | 13 +-------
src/lib/failures.c | 8 ++---
src/lib/file-copy.c | 4 +-
src/lib/file-dotlock.c | 12 +++----
src/lib/imem.c | 4 +-
src/lib/ioloop.c | 4 +-
src/lib/mkdir-parents.c | 4 +-
src/lib/module-dir.c | 20 ++++++-------
src/lib/nfs-workarounds.c | 4 +-
src/lib/restrict-access.c | 4 +-
src/lib/strfuncs.c | 4 +-
src/lib/unlink-old-files.c | 4 +-
src/login-common/client-common.c | 4 +-
src/login-common/ssl-proxy-gnutls.c | 4 +-
src/master/auth-process.c | 4 +-
src/master/log.c | 8 ++---
src/master/login-process.c | 4 +-
src/master/main.c | 12 +++----
src/plugins/acl/acl-api.c | 4 +-
src/plugins/acl/acl-backend-vfile-acllist.c | 4 +-
src/plugins/acl/acl-backend-vfile.c | 4 +-
src/plugins/acl/acl-backend.c | 4 +-
src/plugins/acl/acl-cache.c | 8 ++---
src/plugins/acl/acl-mailbox-list.c | 16 +++++-----
src/plugins/acl/acl-storage.c | 4 +-
src/plugins/convert/convert-storage.c | 4 +-
src/plugins/expire/expire-plugin.c | 4 +-
src/plugins/expire/expire-tool.c | 4 +-
src/plugins/fts-squat/squat-trie.c | 24 +++++++--------
src/plugins/fts-squat/squat-uidlist.c | 8 ++---
src/plugins/fts/fts-api.c | 4 +-
src/plugins/fts/fts-search.c | 8 ++---
src/plugins/fts/fts-storage.c | 8 ++---
src/plugins/mail-log/mail-log-plugin.c | 16 +++++-----
src/plugins/quota/quota-dict.c | 8 ++---
src/plugins/quota/quota-dirsize.c | 4 +-
src/plugins/quota/quota-fs.c | 4 +-
src/plugins/quota/quota-maildir.c | 12 +++----
src/pop3/client.c | 8 ++---
src/tests/test-lib.c | 8 ++---
src/util/idxview.c | 4 +-
src/util/listview.c | 4 +-
src/util/logview.c | 4 +-
diffs (truncated from 3557 to 300 lines):
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/auth-client-connection.c
--- a/src/auth/auth-client-connection.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/auth-client-connection.c Mon Feb 11 20:17:00 2008 +0200
@@ -245,10 +245,10 @@ static void auth_client_input(struct aut
conn->refcount++;
while ((line = i_stream_next_line(conn->input)) != NULL) {
- T_FRAME(
+ T_BEGIN {
ret = auth_client_handle_line(conn, line);
safe_memset(line, 0, strlen(line));
- );
+ } T_END;
if (!ret) {
struct auth_client_connection *tmp_conn = conn;
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/auth-master-connection.c Mon Feb 11 20:17:00 2008 +0200
@@ -216,9 +216,9 @@ static void master_input(struct auth_mas
}
while ((line = i_stream_next_line(conn->input)) != NULL) {
- T_FRAME(
+ T_BEGIN {
ret = auth_master_input_line(conn, line);
- );
+ } T_END;
if (!ret) {
auth_master_connection_destroy(&conn);
return;
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/auth-request.c
--- a/src/auth/auth-request.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/auth-request.c Mon Feb 11 20:17:00 2008 +0200
@@ -1454,9 +1454,9 @@ void auth_request_log_debug(struct auth_
return;
va_start(va, format);
- T_FRAME(
+ T_BEGIN {
i_info("%s", get_log_str(auth_request, subsystem, format, va));
- );
+ } T_END;
va_end(va);
}
@@ -1470,9 +1470,9 @@ void auth_request_log_info(struct auth_r
return;
va_start(va, format);
- T_FRAME(
+ T_BEGIN {
i_info("%s", get_log_str(auth_request, subsystem, format, va));
- );
+ } T_END;
va_end(va);
}
@@ -1483,8 +1483,8 @@ void auth_request_log_error(struct auth_
va_list va;
va_start(va, format);
- T_FRAME(
+ T_BEGIN {
i_error("%s", get_log_str(auth_request, subsystem, format, va));
- );
+ } T_END;
va_end(va);
}
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/auth-worker-client.c Mon Feb 11 20:17:00 2008 +0200
@@ -441,9 +441,9 @@ static void auth_worker_input(struct aut
client->refcount++;
while ((line = i_stream_next_line(client->input)) != NULL) {
- T_FRAME(
+ T_BEGIN {
ret = auth_worker_handle_line(client, line);
- );
+ } T_END;
if (!ret) {
auth_worker_client_destroy(&client);
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/auth-worker-server.c Mon Feb 11 20:17:00 2008 +0200
@@ -118,10 +118,10 @@ static void auth_worker_destroy(struct a
requests = array_get_modifiable(&conn->requests, &count);
for (i = 0; i < count; i++) {
if (requests[i].id != 0) {
- T_FRAME(
+ T_BEGIN {
requests[i].callback(requests[i].auth_request,
reply);
- );
+ } T_END;
auth_request_unref(&requests[i].auth_request);
}
}
@@ -225,11 +225,11 @@ static void worker_input(struct auth_wor
if (line == NULL)
continue;
- T_FRAME(
+ T_BEGIN {
id = (unsigned int)strtoul(t_strcut(id_str, '\t'),
NULL, 10);
request = auth_worker_request_lookup(conn, id);
- );
+ } T_END;
if (request != NULL)
auth_worker_handle_request(conn, request, line + 1);
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/db-ldap.c
--- a/src/auth/db-ldap.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/db-ldap.c Mon Feb 11 20:17:00 2008 +0200
@@ -516,9 +516,9 @@ db_ldap_handle_result(struct ldap_connec
res = NULL;
}
- T_FRAME(
+ T_BEGIN {
request->callback(conn, request, res);
- );
+ } T_END;
if (i > 0) {
/* see if there are timed out requests */
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/db-passwd-file.c
--- a/src/auth/db-passwd-file.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/db-passwd-file.c Mon Feb 11 20:17:00 2008 +0200
@@ -187,7 +187,7 @@ static bool passwd_file_open(struct pass
if (*line == '\0' || *line == ':' || *line == '#')
continue; /* no username or comment */
- T_FRAME(
+ T_BEGIN {
const char *const *args = t_strsplit(line, ":");
if (args[1] != NULL) {
/* at least username+password */
@@ -196,7 +196,7 @@ static bool passwd_file_open(struct pass
/* only username */
passwd_file_add(pw, args[0], NULL, &no_args);
}
- );
+ } T_END;
}
i_stream_destroy(&input);
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/auth/main.c
--- a/src/auth/main.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/auth/main.c Mon Feb 11 20:17:00 2008 +0200
@@ -321,10 +321,10 @@ int main(int argc ATTR_UNUSED, char *arg
argv++;
}
- T_FRAME(
+ T_BEGIN {
drop_privileges();
main_init(foreground);
- );
+ } T_END;
io_loop_run(ioloop);
main_deinit();
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/deliver/deliver.c
--- a/src/deliver/deliver.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/deliver/deliver.c Mon Feb 11 20:17:00 2008 +0200
@@ -817,9 +817,9 @@ int main(int argc, char *argv[])
"destination user parameter (-d user) not given");
}
- T_FRAME(
+ T_BEGIN {
config_file_init(config_path);
- );
+ } T_END;
open_logfile(user);
if (getenv("MAIL_DEBUG") != NULL)
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/dict/dict-server.c
--- a/src/dict/dict-server.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/dict/dict-server.c Mon Feb 11 20:17:00 2008 +0200
@@ -92,12 +92,12 @@ static int cmd_iterate(struct dict_clien
while ((ret = dict_iterate(ctx, &key, &value)) > 0) {
/* FIXME: we don't want to keep blocking here. set a flush
function and send the replies there when buffer gets full */
- T_FRAME(
+ T_BEGIN {
const char *reply;
reply = t_strdup_printf("%s\t%s\n", key, value);
o_stream_send_str(conn->output, reply);
- );
+ } T_END;
}
dict_iterate_deinit(ctx);
@@ -399,9 +399,9 @@ static void dict_client_connection_input
ret = 0;
for (i = 0; cmds[i].cmd != '\0'; i++) {
if (cmds[i].cmd == *line) {
- T_FRAME(
+ T_BEGIN {
ret = cmds[i].func(conn, line + 1);
- );
+ } T_END;
break;
}
}
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/imap/client.c
--- a/src/imap/client.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/imap/client.c Mon Feb 11 20:17:00 2008 +0200
@@ -642,9 +642,9 @@ static bool client_handle_input(struct c
client->handling_input = TRUE;
do {
- T_FRAME(
+ T_BEGIN {
ret = client_handle_next_command(client, &remove_io);
- );
+ } T_END;
if (ret)
handled_commands = TRUE;
} while (ret && !client->disconnected && client->io != NULL);
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/imap/cmd-list.c
--- a/src/imap/cmd-list.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/imap/cmd-list.c Mon Feb 11 20:17:00 2008 +0200
@@ -361,9 +361,9 @@ list_namespace_mailboxes(struct cmd_list
if (ctx->status_items != 0 &&
(flags & (MAILBOX_NONEXISTENT | MAILBOX_NOSELECT)) == 0) {
- T_FRAME(
+ T_BEGIN {
list_send_status(ctx, name);
- );
+ } T_END;
}
if (client_send_line(ctx->cmd->client, str_c(str)) == 0) {
@@ -671,16 +671,16 @@ static bool cmd_list_continue(struct cli
}
for (; ctx->ns != NULL; ctx->ns = ctx->ns->next) {
if (ctx->list_iter == NULL) {
- T_FRAME(
+ T_BEGIN {
list_namespace_init(ctx);
- );
+ } T_END;
if (ctx->list_iter == NULL)
continue;
}
- T_FRAME(
+ T_BEGIN {
ret = list_namespace_mailboxes(ctx);
- );
+ } T_END;
if (ret < 0) {
client_send_list_error(cmd, ctx->ns->list);
return TRUE;
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/imap/imap-fetch.c
--- a/src/imap/imap-fetch.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/imap/imap-fetch.c Mon Feb 11 20:17:00 2008 +0200
@@ -302,13 +302,13 @@ static int imap_fetch_more(struct imap_f
}
i_assert(ctx->cur_input == NULL);
- T_FRAME(
+ T_BEGIN {
const struct imap_fetch_context_handler *h =
&handlers[ctx->cur_handler];
ret = h->handler(ctx, ctx->cur_mail,
h->context);
- );
+ } T_END;
if (ret == 0)
return 0;
diff -r 0fe19a3d82a3 -r e6693a0ec8e1 src/imap/imap-thread.c
--- a/src/imap/imap-thread.c Mon Feb 11 19:58:43 2008 +0200
+++ b/src/imap/imap-thread.c Mon Feb 11 20:17:00 2008 +0200
@@ -140,9 +140,9 @@ int imap_thread(struct client_command_co
wanted_headers);
mail = mail_alloc(ctx->t, MAIL_FETCH_DATE, headers_ctx);
while (mailbox_search_next(ctx->search_ctx, mail) > 0) {
- T_FRAME(
+ T_BEGIN {
mail_thread_input(ctx, mail);
- );
+ } T_END;
}
mail_free(&mail);
@@ -699,9 +699,9 @@ static void gather_base_subjects(struct
mail_set_seq(ctx->mail, seq);
if (mail_get_first_header(ctx->mail, "subject",
&subject) > 0) {
More information about the dovecot-cvs
mailing list