dovecot: Replaced t_push/t_pop calls with T_FRAME*() macros.
dovecot at dovecot.org
dovecot at dovecot.org
Wed Dec 5 17:47:56 EET 2007
details: http://hg.dovecot.org/dovecot/rev/414c9d631a81
changeset: 6940:414c9d631a81
user: Timo Sirainen <tss at iki.fi>
date: Wed Dec 05 17:47:44 2007 +0200
description:
Replaced t_push/t_pop calls with T_FRAME*() macros.
diffstat:
144 files changed, 1876 insertions(+), 1672 deletions(-)
src/auth/auth-client-connection.c | 8
src/auth/auth-master-connection.c | 45 ++--
src/auth/auth-request-handler.c | 4
src/auth/auth-request.c | 31 ---
src/auth/auth-worker-client.c | 8
src/auth/auth-worker-server.c | 14 -
src/auth/auth.c | 6
src/auth/db-ldap.c | 6
src/auth/db-passwd-file.c | 33 +--
src/auth/main.c | 16 -
src/auth/mech-digest-md5.c | 3
src/auth/passdb-pam.c | 3
src/auth/passdb-passwd-file.c | 4
src/auth/passdb-sql.c | 4
src/auth/userdb-nss.c | 2
src/auth/userdb-passwd-file.c | 2
src/auth/userdb-static.c | 4
src/deliver/deliver.c | 6
src/dict/dict-server.c | 18 +
src/imap/client.c | 6
src/imap/cmd-list.c | 23 +-
src/imap/imap-fetch-body.c | 5
src/imap/imap-fetch.c | 12 -
src/imap/imap-status.c | 2
src/imap/imap-sync.c | 6
src/imap/imap-thread.c | 28 +-
src/imap/mail-storage-callbacks.c | 26 +-
src/lib-auth/auth-server-connection.c | 46 ++--
src/lib-auth/auth-server-request.c | 33 +--
src/lib-dict/dict-client.c | 135 +++++++-------
src/lib-dict/dict-sql.c | 198 +++++++++++----------
src/lib-dict/dict.c | 18 -
src/lib-imap/imap-bodystructure.c | 36 +--
src/lib-imap/imap-match.c | 30 ++-
src/lib-imap/imap-quote.c | 13 -
src/lib-index/mail-cache-fields.c | 15 -
src/lib-index/mail-cache-lookup.c | 38 ++--
src/lib-index/mail-cache-transaction.c | 38 ++--
src/lib-index/mail-cache.c | 10 -
src/lib-index/mail-index-fsck.c | 9
src/lib-index/mail-index-map.c | 9
src/lib-index/mail-index-sync-ext.c | 9
src/lib-index/mail-index-sync-update.c | 7
src/lib-index/mail-index-sync.c | 22 +-
src/lib-index/mail-index-view-sync.c | 7
src/lib-index/mail-transaction-log-append.c | 9
src/lib-index/mail-transaction-log-file.c | 10 -
src/lib-index/mail-transaction-log-view.c | 27 +-
src/lib-index/mailbox-list-index-sync.c | 26 +-
src/lib-index/mailbox-list-index.c | 52 +++--
src/lib-mail/message-address.c | 27 ++
src/lib-mail/message-date.c | 14 -
src/lib-mail/message-decoder.c | 22 --
src/lib-mail/message-parser.c | 6
src/lib-mail/message-search.c | 51 +++--
src/lib-settings/settings.c | 22 +-
src/lib-sql/driver-mysql.c | 6
src/lib-sql/driver-pgsql.c | 6
src/lib-sql/sql-pool.c | 9
src/lib-storage/index/cydir/cydir-save.c | 30 +--
src/lib-storage/index/cydir/cydir-storage.c | 4
src/lib-storage/index/dbox/dbox-file.c | 32 ++-
src/lib-storage/index/dbox/dbox-index.c | 19 --
src/lib-storage/index/dbox/dbox-storage.c | 4
src/lib-storage/index/dbox/dbox-sync-file.c | 14 -
src/lib-storage/index/dbox/dbox-sync-rebuild.c | 50 +++--
src/lib-storage/index/index-mail-headers.c | 102 ++++++----
src/lib-storage/index/index-mail.c | 107 ++++++-----
src/lib-storage/index/index-search.c | 56 +++--
src/lib-storage/index/index-sort.c | 56 +++--
src/lib-storage/index/index-storage.c | 27 +-
src/lib-storage/index/maildir/maildir-copy.c | 8
src/lib-storage/index/maildir/maildir-keywords.c | 6
src/lib-storage/index/maildir/maildir-save.c | 131 +++++++------
src/lib-storage/index/maildir/maildir-storage.c | 42 +---
src/lib-storage/index/maildir/maildir-sync.c | 72 +++----
src/lib-storage/index/maildir/maildir-uidlist.c | 40 ++--
src/lib-storage/index/maildir/maildir-util.c | 50 +++--
src/lib-storage/index/mbox/mbox-save.c | 46 ++--
src/lib-storage/index/mbox/mbox-storage.c | 17 -
src/lib-storage/index/mbox/mbox-sync-parse.c | 28 +-
src/lib-storage/index/mbox/mbox-sync-update.c | 31 ++-
src/lib-storage/index/mbox/mbox-sync.c | 9
src/lib-storage/index/raw/raw-storage.c | 17 -
src/lib-storage/list/index-mailbox-list-sync.c | 6
src/lib-storage/list/mailbox-list-fs-iter.c | 38 +---
src/lib-storage/list/mailbox-list-maildir-iter.c | 33 +--
src/lib-storage/list/mailbox-list-maildir.c | 9
src/lib-storage/list/mailbox-list-subscriptions.c | 26 ++
src/lib-storage/mail-namespace.c | 28 +-
src/lib-storage/mail-storage.c | 17 +
src/lib-storage/mailbox-list.c | 16 +
src/lib-storage/mailbox-tree.c | 17 +
src/lib/compat.c | 6
src/lib/failures.c | 42 ++--
src/lib/file-copy.c | 27 +-
src/lib/file-dotlock.c | 31 +--
src/lib/imem.c | 22 +-
src/lib/mkdir-parents.c | 10 -
src/lib/module-dir.c | 78 ++++----
src/lib/nfs-workarounds.c | 8
src/lib/restrict-access.c | 16 -
src/lib/strfuncs.c | 34 +--
src/lib/unlink-lockfiles.c | 30 ++-
src/login-common/client-common.c | 10 -
src/login-common/ssl-proxy-gnutls.c | 9
src/master/auth-process.c | 33 +--
src/master/dup2-array.c | 4
src/master/listener.c | 2
src/master/log.c | 14 -
src/master/login-process.c | 6
src/master/mail-process.c | 3
src/master/main.c | 25 +-
src/master/master-settings.c | 6
src/plugins/acl/acl-api.c | 23 +-
src/plugins/acl/acl-backend-vfile-acllist.c | 11 -
src/plugins/acl/acl-backend-vfile.c | 18 -
src/plugins/acl/acl-backend.c | 7
src/plugins/acl/acl-cache.c | 27 ++
src/plugins/acl/acl-mailbox-list.c | 39 ++--
src/plugins/acl/acl-storage.c | 6
src/plugins/convert/convert-storage.c | 9
src/plugins/expire/expire-plugin.c | 54 ++---
src/plugins/expire/expire-tool.c | 53 ++---
src/plugins/fts-squat/squat-trie.c | 75 +++++--
src/plugins/fts-squat/squat-uidlist.c | 22 +-
src/plugins/fts/fts-api.c | 8
src/plugins/fts/fts-search.c | 13 -
src/plugins/fts/fts-storage.c | 24 +-
src/plugins/imap-quota/imap-quota-plugin.c | 4
src/plugins/lazy-expunge/lazy-expunge-plugin.c | 6
src/plugins/mail-log/mail-log-plugin.c | 34 +--
src/plugins/quota/quota-dict.c | 47 ++--
src/plugins/quota/quota-dirsize.c | 22 +-
src/plugins/quota/quota-fs.c | 6
src/plugins/quota/quota-maildir.c | 46 ++--
src/plugins/quota/quota-plugin.c | 10 -
src/plugins/quota/quota.c | 9
src/pop3-login/client.c | 12 -
src/pop3/client.c | 29 +--
src/pop3/commands.c | 15 -
src/util/idxview.c | 10 -
src/util/listview.c | 6
src/util/logview.c | 14 -
diffs (truncated from 8466 to 300 lines):
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-client-connection.c
--- a/src/auth/auth-client-connection.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-client-connection.c Wed Dec 05 17:47:44 2007 +0200
@@ -245,10 +245,10 @@ static void auth_client_input(struct aut
conn->refcount++;
while ((line = i_stream_next_line(conn->input)) != NULL) {
- t_push();
- ret = auth_client_handle_line(conn, line);
- safe_memset(line, 0, strlen(line));
- t_pop();
+ T_FRAME(
+ ret = auth_client_handle_line(conn, line);
+ safe_memset(line, 0, strlen(line));
+ );
if (!ret) {
struct auth_client_connection *tmp_conn = conn;
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-master-connection.c Wed Dec 05 17:47:44 2007 +0200
@@ -156,6 +156,28 @@ master_input_user(struct auth_master_con
return TRUE;
}
+static bool
+auth_master_input_line(struct auth_master_connection *conn, const char *line)
+{
+ if (conn->listener->auth->verbose_debug)
+ i_info("master in: %s", line);
+
+ if (strncmp(line, "REQUEST\t", 8) == 0)
+ return master_input_request(conn, line + 8);
+ else if (strncmp(line, "USER\t", 5) == 0)
+ return master_input_user(conn, line + 5);
+ else if (strncmp(line, "CPID\t", 5) == 0) {
+ i_error("Authentication client trying to connect to "
+ "master socket");
+ return FALSE;
+ } else {
+ /* ignore unknown command */
+ i_error("BUG: Unknown command in master socket: %s",
+ str_sanitize(line, 80));
+ return FALSE;
+ }
+}
+
static void master_input(struct auth_master_connection *conn)
{
char *line;
@@ -194,26 +216,9 @@ static void master_input(struct auth_mas
}
while ((line = i_stream_next_line(conn->input)) != NULL) {
- if (conn->listener->auth->verbose_debug)
- i_info("master in: %s", line);
-
- t_push();
- if (strncmp(line, "REQUEST\t", 8) == 0)
- ret = master_input_request(conn, line + 8);
- else if (strncmp(line, "USER\t", 5) == 0)
- ret = master_input_user(conn, line + 5);
- else if (strncmp(line, "CPID\t", 5) == 0) {
- i_error("Authentication client trying to connect to "
- "master socket");
- ret = FALSE;
- } else {
- /* ignore unknown command */
- i_error("BUG: Unknown command in master socket: %s",
- str_sanitize(line, 80));
- ret = FALSE;
- }
- t_pop();
-
+ T_FRAME(
+ ret = auth_master_input_line(conn, line);
+ );
if (!ret) {
auth_master_connection_destroy(&conn);
return;
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-request-handler.c Wed Dec 05 17:47:44 2007 +0200
@@ -154,8 +154,6 @@ static void auth_callback(struct auth_re
struct auth_request_handler *handler = request->context;
string_t *str;
const char *fields;
-
- t_push();
str = t_str_new(128 + MAX_BASE64_ENCODED_SIZE(reply_size));
switch (result) {
@@ -224,8 +222,6 @@ static void auth_callback(struct auth_re
/* NOTE: request may be destroyed now */
auth_request_handler_unref(&handler);
-
- t_pop();
}
static void auth_request_handler_auth_fail(struct auth_request_handler *handler,
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-request.c
--- a/src/auth/auth-request.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-request.c Wed Dec 05 17:47:44 2007 +0200
@@ -749,13 +749,11 @@ auth_request_fix_username(struct auth_re
old_username = request->user;
request->user = user;
- t_push();
dest = t_str_new(256);
table = auth_request_get_var_expand_table(request,
auth_request_str_escape);
var_expand(dest, request->auth->username_format, table);
user = p_strdup(request->pool, str_c(dest));
- t_pop();
request->user = old_username;
}
@@ -919,7 +917,6 @@ static void auth_request_validate_networ
return;
}
- t_push();
for (net = t_strsplit_spaces(networks, ", "); *net != NULL; net++) {
auth_request_log_debug(request, "auth",
"allow_nets: Matching for network %s", *net);
@@ -935,7 +932,6 @@ static void auth_request_validate_networ
break;
}
}
- t_pop();
if (!found) {
auth_request_log_info(request, "passdb",
@@ -1084,7 +1080,6 @@ void auth_request_set_fields(struct auth
{
const char *key, *value;
- t_push();
for (; *fields != NULL; fields++) {
if (**fields == '\0')
continue;
@@ -1099,7 +1094,6 @@ void auth_request_set_fields(struct auth
}
auth_request_set_field(request, key, value, default_scheme);
}
- t_pop();
}
void auth_request_init_userdb_reply(struct auth_request *request)
@@ -1117,7 +1111,6 @@ auth_request_change_userdb_user(struct a
if (strcmp(user, request->user) == 0)
return;
- t_push();
str = t_strdup(auth_stream_reply_export(request->userdb_reply));
/* reset the reply and add the new username */
@@ -1130,7 +1123,6 @@ auth_request_change_userdb_user(struct a
str = strchr(str, '\t');
i_assert(str != NULL);
auth_stream_reply_import(request->userdb_reply, str + 1);
- t_pop();
}
static void auth_request_set_uidgid_file(struct auth_request *request,
@@ -1139,7 +1131,6 @@ static void auth_request_set_uidgid_file
string_t *path;
struct stat st;
- t_push();
path = t_str_new(256);
var_expand(path, path_template,
auth_request_get_var_expand_table(request, NULL));
@@ -1152,7 +1143,6 @@ static void auth_request_set_uidgid_file
auth_stream_reply_add(request->userdb_reply,
"gid", dec2str(st.st_gid));
}
- t_pop();
}
void auth_request_set_userdb_field(struct auth_request *request,
@@ -1201,13 +1191,11 @@ void auth_request_set_userdb_field_value
string_t *value;
gid_t gid;
- t_push();
value = t_str_new(128);
for (; *values != NULL; values++) {
gid = userdb_parse_gid(request, *values);
if (gid == (gid_t)-1) {
request->userdb_lookup_failed = TRUE;
- t_pop();
return;
}
@@ -1217,7 +1205,6 @@ void auth_request_set_userdb_field_value
}
auth_stream_reply_add(request->userdb_reply, name,
str_c(value));
- t_pop();
} else {
/* add only one */
auth_request_set_userdb_field(request, name, *values);
@@ -1401,9 +1388,9 @@ void auth_request_log_debug(struct auth_
return;
va_start(va, format);
- t_push();
- i_info("%s", get_log_str(auth_request, subsystem, format, va));
- t_pop();
+ T_FRAME(
+ i_info("%s", get_log_str(auth_request, subsystem, format, va));
+ );
va_end(va);
}
@@ -1417,9 +1404,9 @@ void auth_request_log_info(struct auth_r
return;
va_start(va, format);
- t_push();
- i_info("%s", get_log_str(auth_request, subsystem, format, va));
- t_pop();
+ T_FRAME(
+ i_info("%s", get_log_str(auth_request, subsystem, format, va));
+ );
va_end(va);
}
@@ -1430,8 +1417,8 @@ void auth_request_log_error(struct auth_
va_list va;
va_start(va, format);
- t_push();
- i_error("%s", get_log_str(auth_request, subsystem, format, va));
- t_pop();
+ T_FRAME(
+ i_error("%s", get_log_str(auth_request, subsystem, format, va));
+ );
va_end(va);
}
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-worker-client.c Wed Dec 05 17:47:44 2007 +0200
@@ -56,7 +56,6 @@ worker_auth_request_new(struct auth_work
auth_request->id = id;
if (args != NULL) {
- t_push();
for (tmp = t_strsplit(args, "\t"); *tmp != NULL; tmp++) {
value = strchr(*tmp, '=');
if (value == NULL)
@@ -67,7 +66,6 @@ worker_auth_request_new(struct auth_work
(void)auth_request_import(auth_request, key, value);
}
- t_pop();
}
return auth_request;
@@ -443,9 +441,9 @@ static void auth_worker_input(struct aut
client->refcount++;
while ((line = i_stream_next_line(client->input)) != NULL) {
- t_push();
- ret = auth_worker_handle_line(client, line);
- t_pop();
+ T_FRAME(
+ ret = auth_worker_handle_line(client, line);
+ );
if (!ret) {
auth_worker_client_destroy(&client);
diff -r c7b42fea5fcc -r 414c9d631a81 src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Wed Dec 05 17:47:19 2007 +0200
+++ b/src/auth/auth-worker-server.c Wed Dec 05 17:47:44 2007 +0200
@@ -122,7 +122,10 @@ static void auth_worker_destroy(struct a
reply = t_strdup_printf("FAIL\t%d", PASSDB_RESULT_INTERNAL_FAILURE);
for (i = 0; i < size; i++) {
if (request[i].id != 0) {
- request[i].callback(request[i].auth_request, reply);
+ T_FRAME(
+ request[i].callback(request[i].auth_request,
+ reply);
+ );
auth_request_unref(&request[i].auth_request);
}
}
@@ -230,10 +233,11 @@ static void worker_input(struct auth_wor
if (line == NULL)
continue;
- t_push();
- id = (unsigned int)strtoul(t_strcut(id_str, '\t'), NULL, 10);
- request = auth_worker_request_lookup(conn, id);
- t_pop();
+ T_FRAME(
+ id = (unsigned int)strtoul(t_strcut(id_str, '\t'),
+ NULL, 10);
More information about the dovecot-cvs
mailing list