Fix printing of fixed strings.

diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index 8c2878ced8ab161c45640ef9c1b4cd4245018ef1..150c780a12df0b58701ae9784cc937176e12b3de 100644 (file)
--- a/src/client/rspamc.c
+++ b/src/client/rspamc.c
@@ -941,7 +941,7 @@ rspamc_mime_output (FILE *out, ucl_object_t *result, GString *input,
                folded_symbuf = rspamd_header_value_fold ("X-Spam-Symbols",
                                symbuf->str,
                                0);
-               rspamd_printf_gstring (added_headers, "X-Spam-Symbols: %V\r\n",
+               rspamd_printf_gstring (added_headers, "X-Spam-Symbols: %v\r\n",
                                folded_symbuf);
                g_string_free (folded_symbuf, TRUE);
                g_string_free (symbuf, TRUE);
@@ -978,7 +978,8 @@ rspamc_mime_output (FILE *out, ucl_object_t *result, GString *input,
        /* Write message */
        if (rspamd_fprintf (out, "%*s", (gint)headers_pos, input->str)
                        == headers_pos) {
-               if (rspamd_fprintf (out, "%V", added_headers) == (gint)added_headers->len) {
+               if (rspamd_fprintf (out, "%v", added_headers)
+                               == (gint)added_headers->len) {
                        rspamd_fprintf (out, "%s", input->str + headers_pos);
                }
        }

diff --git a/src/controller.c b/src/controller.c
index d02508f0741f0f72d97c30a9fdb49fbee287872e..c68cd1bdceec1b191098f7ccf868642b6430b798 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -1670,7 +1670,7 @@ rspamd_controller_handle_savemap (struct rspamd_http_connection_entry *conn_ent,
 
        id = strtoul (idstr->str, &errstr, 10);
        if (*errstr != '\0' && !g_ascii_isspace (*errstr)) {
-               msg_info_session ("invalid map id: %V", idstr);
+               msg_info_session ("invalid map id: %v", idstr);
                rspamd_controller_send_error (conn_ent, 400, "Map id is invalid");
                return 0;
        }
@@ -1983,7 +1983,7 @@ rspamd_controller_handle_custom (struct rspamd_http_connection_entry *conn_ent,
 
        cmd = g_hash_table_lookup (session->ctx->custom_commands, msg->url->str);
        if (cmd == NULL || cmd->handler == NULL) {
-               msg_err_session ("custom command %V has not been found", msg->url);
+               msg_err_session ("custom command %v has not been found", msg->url);
                rspamd_controller_send_error (conn_ent, 404, "No command associated");
                return 0;
        }

diff --git a/src/libmime/smtp_proto.c b/src/libmime/smtp_proto.c
index d00a25e0fefa43723f7a9da23056a4fd1b5ee18d..05d5c43d51537c8adc68f019b4b664aa3d1d76c2 100644 (file)
--- a/src/libmime/smtp_proto.c
+++ b/src/libmime/smtp_proto.c
@@ -374,7 +374,7 @@ smtp_upstream_write_list (GList *args, gchar *buf, size_t buflen)
 
        while (cur && r < buflen - 3) {
                arg = cur->data;
-               r += rspamd_snprintf (buf + r, buflen - r, " %V", arg);
+               r += rspamd_snprintf (buf + r, buflen - r, " %T", arg);
                cur = g_list_next (cur);
        }
 
@@ -409,7 +409,7 @@ smtp_upstream_read_socket (rspamd_ftok_t * in, void *arg)
        gchar outbuf[BUFSIZ];
        gint r;
 
-       msg_debug ("in: %V, state: %d", in, session->upstream_state);
+       msg_debug ("in: %T, state: %d", in, session->upstream_state);
        switch (session->upstream_state) {
        case SMTP_STATE_GREETING:
                r = check_smtp_ustream_reply (in, '2');
@@ -715,7 +715,7 @@ smtp_upstream_read_socket (rspamd_ftok_t * in, void *arg)
                return FALSE;
                break;
        default:
-               msg_err ("got upstream reply at unexpected state: %d, reply: %V",
+               msg_err ("got upstream reply at unexpected state: %d, reply: %T",
                        session->upstream_state,
                        in);
                session->state = SMTP_STATE_CRITICAL_ERROR;

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 37c0857d6ca886d3293dcabd6586232475ddb390..0c1d6887f07d177b2a0cae340e94aac9e2ae40ac 100644 (file)
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -772,7 +772,7 @@ format_surbl_request (rspamd_mempool_t * pool,
                                if (level == 0) {
                                        r = rspamd_snprintf (result,
                                                        len,
-                                                       "%V",
+                                                       "%T",
                                                        hostname);
                                }
                                else {
@@ -791,7 +791,7 @@ format_surbl_request (rspamd_mempool_t * pool,
                        else {
                                r = rspamd_snprintf (result,
                                                len,
-                                               "%V",
+                                               "%T",
                                                hostname);
                        }
                }