summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-06 16:51:51 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-06 16:51:51 +0100
commit8aadb475905cf6f1b2fbfd3cf4834cf8cacff8c8 (patch)
tree2057549d2c4890ab90f462d8d299a99fba26687c /src
parent8e6bd45485c358e5081e5f49e8376e8098f4a95e (diff)
downloadrspamd-8aadb475905cf6f1b2fbfd3cf4834cf8cacff8c8.tar.gz
rspamd-8aadb475905cf6f1b2fbfd3cf4834cf8cacff8c8.zip
Fix printing of fixed strings.
Diffstat (limited to 'src')
-rw-r--r--src/client/rspamc.c5
-rw-r--r--src/controller.c4
-rw-r--r--src/libmime/smtp_proto.c6
-rw-r--r--src/plugins/surbl.c4
4 files changed, 10 insertions, 9 deletions
diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index 8c2878ced..150c780a1 100644
--- 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 d02508f07..c68cd1bdc 100644
--- 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 d00a25e0f..05d5c43d5 100644
--- 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 37c0857d6..0c1d6887f 100644
--- 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);
}
}