From 9ca065aa3c125f63ac68939b109ea6ec36e5917d Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 8 Aug 2016 09:29:26 +0300 Subject: [PATCH] doveadm: Streamline tabunescape --- src/doveadm/server-connection.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c index cec84fe4a2..f0c728ab24 100644 --- a/src/doveadm/server-connection.c +++ b/src/doveadm/server-connection.c @@ -157,12 +157,9 @@ server_connection_callback(struct server_connection *conn, static void stream_data(string_t *str, const unsigned char *data, size_t size) { - const char *text; - str_truncate(str, 0); - str_append_n(str, data, size); - text = str_tabunescape(str_c_modifiable(str)); - doveadm_print_stream(text, strlen(text)); + str_append_tabunescaped(str, data, size); + doveadm_print_stream(str->data, str->used); } static void server_flush_field(struct server_connection *conn, string_t *str, @@ -174,12 +171,9 @@ static void server_flush_field(struct server_connection *conn, string_t *str, stream_data(str, data, size); doveadm_print_stream("", 0); } else { - const char *text; - str_truncate(str, 0); - str_append_n(str, data, size); - text = str_tabunescape(str_c_modifiable(str)); - doveadm_print(text); + str_append_tabunescaped(str, data, size); + doveadm_print(str_c(str)); } } -- 2.47.3