dovecot-2.2: Renamed str_tabescape_write() to str_append_tabesca...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 00:57:05 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/002e0a120c2a
changeset: 15068:002e0a120c2a
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 00:56:51 2012 +0300
description:
Renamed str_tabescape_write() to str_append_tabescaped()
diffstat:
src/anvil/connect-limit.c | 2 +-
src/anvil/penalty.c | 2 +-
src/auth/auth-master-connection.c | 2 +-
src/auth/auth-stream.c | 2 +-
src/auth/checkpassword-reply.c | 8 ++++----
src/doveadm/doveadm-mail-index.c | 4 ++--
src/doveadm/doveadm-mail-server.c | 6 +++---
src/doveadm/doveadm-print-server.c | 4 ++--
src/doveadm/dsync/dsync-ibc-stream.c | 6 +++---
src/doveadm/dsync/dsync-serializer.c | 4 ++--
src/imap-urlauth/imap-urlauth-client.c | 4 ++--
src/indexer/worker-connection.c | 4 ++--
src/lib-auth/auth-client-request.c | 10 +++++-----
src/lib-auth/auth-master.c | 2 +-
src/lib-imap-urlauth/imap-urlauth-connection.c | 8 ++++----
src/lib-master/master-instance.c | 6 +++---
src/lib-master/master-login.c | 2 +-
src/lib/strescape.c | 4 ++--
src/lib/strescape.h | 2 +-
src/log/doveadm-connection.c | 4 ++--
src/master/service-process.c | 4 ++--
src/plugins/replication/replication-plugin.c | 4 ++--
src/plugins/stats/stats-connection.c | 4 ++--
src/replication/replicator/doveadm-connection.c | 2 +-
src/replication/replicator/replicator-queue.c | 2 +-
src/stats/client-export.c | 16 ++++++++--------
src/util/script-login.c | 2 +-
27 files changed, 60 insertions(+), 60 deletions(-)
diffs (truncated from 527 to 300 lines):
diff -r 9bff478f81fd -r 002e0a120c2a src/anvil/connect-limit.c
--- a/src/anvil/connect-limit.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/anvil/connect-limit.c Sun Sep 16 00:56:51 2012 +0300
@@ -168,7 +168,7 @@
iter = hash_table_iterate_init(limit->ident_pid_hash);
while (hash_table_iterate(iter, limit->ident_pid_hash, &i, &value)) {
str_truncate(str, 0);
- str_tabescape_write(str, i->ident);
+ str_append_tabescaped(str, i->ident);
str_printfa(str, "\t%ld\t%u\n", (long)i->pid, i->refcount);
if (o_stream_send(output, str_data(str), str_len(str)) < 0)
break;
diff -r 9bff478f81fd -r 002e0a120c2a src/anvil/penalty.c
--- a/src/anvil/penalty.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/anvil/penalty.c Sun Sep 16 00:56:51 2012 +0300
@@ -259,7 +259,7 @@
for (rec = penalty->oldest; rec != NULL; rec = rec->next) {
str_truncate(str, 0);
- str_tabescape_write(str, rec->ident);
+ str_append_tabescaped(str, rec->ident);
str_printfa(str, "\t%u\t%u\t%u\n",
rec->penalty, rec->last_penalty,
rec->last_penalty + rec->last_update);
diff -r 9bff478f81fd -r 002e0a120c2a src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/auth/auth-master-connection.c Sun Sep 16 00:56:51 2012 +0300
@@ -324,7 +324,7 @@
switch (result) {
case PASSDB_RESULT_OK:
str_printfa(str, "PASS\t%u\tuser=", auth_request->id);
- str_tabescape_write(str, auth_request->user);
+ str_append_tabescaped(str, auth_request->user);
if (reply != NULL) {
str_append_c(str, '\t');
str_append(str, auth_stream_reply_export(reply));
diff -r 9bff478f81fd -r 002e0a120c2a src/auth/auth-stream.c
--- a/src/auth/auth-stream.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/auth/auth-stream.c Sun Sep 16 00:56:51 2012 +0300
@@ -36,7 +36,7 @@
}
if (value != NULL) {
/* escape dangerous characters in the value */
- str_tabescape_write(reply->str, value);
+ str_append_tabescaped(reply->str, value);
}
}
diff -r 9bff478f81fd -r 002e0a120c2a src/auth/checkpassword-reply.c
--- a/src/auth/checkpassword-reply.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/auth/checkpassword-reply.c Sun Sep 16 00:56:51 2012 +0300
@@ -25,7 +25,7 @@
return 1;
}
str_printfa(str, "user=");
- str_tabescape_write(str, user);
+ str_append_tabescaped(str, user);
str_append_c(str, '\t');
}
@@ -36,7 +36,7 @@
return 1;
}
str_printfa(str, "userdb_home=");
- str_tabescape_write(str, home);
+ str_append_tabescaped(str, home);
str_append_c(str, '\t');
}
@@ -50,9 +50,9 @@
uid_found = TRUE;
else if (strcmp(key, "userdb_gid") == 0)
gid_found = TRUE;
- str_tabescape_write(str, key);
+ str_append_tabescaped(str, key);
str_append_c(str, '=');
- str_tabescape_write(str, value);
+ str_append_tabescaped(str, value);
str_append_c(str, '\t');
}
}
diff -r 9bff478f81fd -r 002e0a120c2a src/doveadm/doveadm-mail-index.c
--- a/src/doveadm/doveadm-mail-index.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/doveadm/doveadm-mail-index.c Sun Sep 16 00:56:51 2012 +0300
@@ -147,9 +147,9 @@
string_t *str = t_str_new(256);
str_append(str, "APPEND\t0\t");
- str_tabescape_write(str, user->username);
+ str_append_tabescaped(str, user->username);
str_append_c(str, '\t');
- str_tabescape_write(str, mailbox);
+ str_append_tabescaped(str, mailbox);
str_printfa(str, "\t%u\n", ctx->max_recent_msgs);
if (write_full(ctx->queue_fd, str_data(str), str_len(str)) < 0)
i_fatal("write(indexer) failed: %m");
diff -r 9bff478f81fd -r 002e0a120c2a src/doveadm/doveadm-mail-server.c
--- a/src/doveadm/doveadm-mail-server.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/doveadm/doveadm-mail-server.c Sun Sep 16 00:56:51 2012 +0300
@@ -128,12 +128,12 @@
str_append_c(cmd, 'v');
str_append_c(cmd, '\t');
- str_tabescape_write(cmd, username);
+ str_append_tabescaped(cmd, username);
str_append_c(cmd, '\t');
- str_tabescape_write(cmd, cmd_ctx->cmd->name);
+ str_append_tabescaped(cmd, cmd_ctx->cmd->name);
for (i = 0; cmd_ctx->full_args[i] != NULL; i++) {
str_append_c(cmd, '\t');
- str_tabescape_write(cmd, cmd_ctx->full_args[i]);
+ str_append_tabescaped(cmd, cmd_ctx->full_args[i]);
}
str_append_c(cmd, '\n');
server_connection_cmd(conn, str_c(cmd), doveadm_cmd_callback, conn);
diff -r 9bff478f81fd -r 002e0a120c2a src/doveadm/doveadm-print-server.c
--- a/src/doveadm/doveadm-print-server.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/doveadm/doveadm-print-server.c Sun Sep 16 00:56:51 2012 +0300
@@ -39,7 +39,7 @@
static void doveadm_print_server_print(const char *value)
{
- str_tabescape_write(ctx.str, value);
+ str_append_tabescaped(ctx.str, value);
str_append_c(ctx.str, '\t');
if (++ctx.header_idx == ctx.header_count) {
@@ -56,7 +56,7 @@
return;
}
T_BEGIN {
- str_tabescape_write(ctx.str, t_strndup(value, size));
+ str_append_tabescaped(ctx.str, t_strndup(value, size));
} T_END;
if (str_len(ctx.str) >= IO_BLOCK_SIZE)
diff -r 9bff478f81fd -r 002e0a120c2a src/doveadm/dsync/dsync-ibc-stream.c
--- a/src/doveadm/dsync/dsync-ibc-stream.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/doveadm/dsync/dsync-ibc-stream.c Sun Sep 16 00:56:51 2012 +0300
@@ -689,7 +689,7 @@
are. */
namestr = t_str_new(128);
for (; *name != NULL; name++) {
- str_tabescape_write(namestr, *name);
+ str_append_tabescaped(namestr, *name);
str_append_c(namestr, '\t');
}
str_truncate(namestr, str_len(namestr)-1);
@@ -1166,10 +1166,10 @@
unsigned int i, count;
changes = array_get(&change->keyword_changes, &count);
- str_tabescape_write(kw_str, changes[0]);
+ str_append_tabescaped(kw_str, changes[0]);
for (i = 1; i < count; i++) {
str_append_c(kw_str, '\t');
- str_tabescape_write(kw_str, changes[i]);
+ str_append_tabescaped(kw_str, changes[i]);
}
dsync_serializer_encode_add(encoder, "keyword_changes",
str_c(kw_str));
diff -r 9bff478f81fd -r 002e0a120c2a src/doveadm/dsync/dsync-serializer.c
--- a/src/doveadm/dsync/dsync-serializer.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/doveadm/dsync/dsync-serializer.c Sun Sep 16 00:56:51 2012 +0300
@@ -56,7 +56,7 @@
for (i = 0; serializer->keys[i] != NULL; i++) {
if (i > 0)
str_append_c(str, '\t');
- str_tabescape_write(str, serializer->keys[i]);
+ str_append_tabescaped(str, serializer->keys[i]);
}
str_append_c(str, '\n');
return str_c(str);
@@ -108,7 +108,7 @@
else {
if (values[i][0] == NULL_CHR)
str_append_c(output, NULL_CHR);
- str_tabescape_write(output, values[i]);
+ str_append_tabescaped(output, values[i]);
}
}
str_append_c(output, '\n');
diff -r 9bff478f81fd -r 002e0a120c2a src/imap-urlauth/imap-urlauth-client.c
--- a/src/imap-urlauth/imap-urlauth-client.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/imap-urlauth/imap-urlauth-client.c Sun Sep 16 00:56:51 2012 +0300
@@ -225,7 +225,7 @@
str = t_str_new(256);
str_append(str, "ACCESS\t");
if (client->username != NULL)
- str_tabescape_write(str, client->username);
+ str_append_tabescaped(str, client->username);
if (client->set->mail_debug)
str_append(str, "\tdebug");
if (array_count(&client->access_apps) > 0) {
@@ -234,7 +234,7 @@
str_append(str, apps[0]);
for (i = 1; i < count; i++) {
str_append_c(str, ',');
- str_tabescape_write(str, apps[i]);
+ str_append_tabescaped(str, apps[i]);
}
}
str_append(str, "\n");
diff -r 9bff478f81fd -r 002e0a120c2a src/indexer/worker-connection.c
--- a/src/indexer/worker-connection.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/indexer/worker-connection.c Sun Sep 16 00:56:51 2012 +0300
@@ -238,9 +238,9 @@
T_BEGIN {
string_t *str = t_str_new(128);
- str_tabescape_write(str, request->username);
+ str_append_tabescaped(str, request->username);
str_append_c(str, '\t');
- str_tabescape_write(str, request->mailbox);
+ str_append_tabescaped(str, request->mailbox);
str_printfa(str, "\t%u\t", request->max_recent_msgs);
if (request->index)
str_append_c(str, 'i');
diff -r 9bff478f81fd -r 002e0a120c2a src/lib-auth/auth-client-request.c
--- a/src/lib-auth/auth-client-request.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/lib-auth/auth-client-request.c Sun Sep 16 00:56:51 2012 +0300
@@ -31,9 +31,9 @@
str = t_str_new(512);
str_printfa(str, "AUTH\t%u\t", request->id);
- str_tabescape_write(str, info->mech);
+ str_append_tabescaped(str, info->mech);
str_append(str, "\tservice=");
- str_tabescape_write(str, info->service);
+ str_append_tabescaped(str, info->service);
if ((info->flags & AUTH_REQUEST_FLAG_SUPPORT_FINAL_RESP) != 0)
str_append(str, "\tfinal-resp-ok");
@@ -46,11 +46,11 @@
if (info->session_id != NULL) {
str_append(str, "\tsession=");
- str_tabescape_write(str, info->session_id);
+ str_append_tabescaped(str, info->session_id);
}
if (info->cert_username != NULL) {
str_append(str, "\tcert_username=");
- str_tabescape_write(str, info->cert_username);
+ str_append_tabescaped(str, info->cert_username);
}
if (info->local_ip.family != 0)
str_printfa(str, "\tlip=%s", net_ip2addr(&info->local_ip));
@@ -62,7 +62,7 @@
str_printfa(str, "\trport=%u", info->remote_port);
if (info->initial_resp_base64 != NULL) {
str_append(str, "\tresp=");
- str_tabescape_write(str, info->initial_resp_base64);
+ str_append_tabescaped(str, info->initial_resp_base64);
}
str_append_c(str, '\n');
diff -r 9bff478f81fd -r 002e0a120c2a src/lib-auth/auth-master.c
--- a/src/lib-auth/auth-master.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/lib-auth/auth-master.c Sun Sep 16 00:56:51 2012 +0300
@@ -595,7 +595,7 @@
if (users != NULL) {
for (; *users != NULL; users++) {
str_append_c(str, '\t');
- str_tabescape_write(str, *users);
+ str_append_tabescaped(str, *users);
}
}
str_append_c(str, '\n');
diff -r 9bff478f81fd -r 002e0a120c2a src/lib-imap-urlauth/imap-urlauth-connection.c
--- a/src/lib-imap-urlauth/imap-urlauth-connection.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/lib-imap-urlauth/imap-urlauth-connection.c Sun Sep 16 00:56:51 2012 +0300
@@ -256,7 +256,7 @@
cmd = t_str_new(128);
str_append(cmd, "URL\t");
- str_tabescape_write(cmd, urlreq->url);
+ str_append_tabescaped(cmd, urlreq->url);
if ((urlreq->flags & IMAP_URLAUTH_FETCH_FLAG_BODYPARTSTRUCTURE) != 0)
str_append(cmd, "\tbpstruct");
if ((urlreq->flags & IMAP_URLAUTH_FETCH_FLAG_BINARY) != 0)
@@ -898,12 +898,12 @@
str = t_str_new(128);
str_printfa(str, IMAP_URLAUTH_HANDSHAKE"AUTH\t%s\t", my_pid);
- str_tabescape_write(str, conn->user->username);
+ str_append_tabescaped(str, conn->user->username);
str_append_c(str, '\t');
if (conn->session_id != NULL)
- str_tabescape_write(str, conn->session_id);
+ str_append_tabescaped(str, conn->session_id);
str_append_c(str, '\t');
- str_tabescape_write(str, conn->user->auth_token);
+ str_append_tabescaped(str, conn->user->auth_token);
str_append_c(str, '\n');
if (o_stream_send(conn->output, str_data(str), str_len(str)) < 0) {
i_warning("Error sending handshake to imap-urlauth server: %m");
diff -r 9bff478f81fd -r 002e0a120c2a src/lib-master/master-instance.c
--- a/src/lib-master/master-instance.c Sun Sep 16 00:52:39 2012 +0300
+++ b/src/lib-master/master-instance.c Sun Sep 16 00:56:51 2012 +0300
@@ -137,12 +137,12 @@
More information about the dovecot-cvs
mailing list