From 4173833067c82b83c94b49ec05e48d77a6a1a466 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 22 Nov 2016 17:44:25 +0000 Subject: [PATCH] [Minor] Some more fixes --- src/libserver/cfg_utils.c | 2 +- src/libstat/stat_process.c | 2 +- src/plugins/fuzzy_check.c | 3 +-- src/rspamadm/signtool.c | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index fb028cced..c6f58b196 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -1304,7 +1304,7 @@ rspamd_check_worker (struct rspamd_config *cfg, worker_t *wrk) ret = FALSE; } if (ret && wrk->rspamd_version != RSPAMD_VERSION_NUM) { - msg_err_config ("worker %s has incorrect rspamd version %xd (%xd expected)", + msg_err_config ("worker %s has incorrect rspamd version %xL (%xL expected)", wrk->name, wrk->rspamd_version, RSPAMD_VERSION_NUM); ret = FALSE; } diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c index 09f7b8a36..04ebe72af 100644 --- a/src/libstat/stat_process.c +++ b/src/libstat/stat_process.c @@ -235,7 +235,7 @@ rspamd_stat_process_tokenize (struct rspamd_stat_ctx *st_ctx, if (pdiff != NULL && (1.0 - *pdiff) * 100.0 > similarity_treshold) { - msg_debug_task ("message has two common parts (%d%%), so skip the last one", + msg_debug_task ("message has two common parts (%.2f), so skip the last one", *pdiff); break; } diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index 3b0121f15..bd1420847 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -1531,8 +1531,7 @@ fuzzy_insert_result (struct fuzzy_client_session *session, "%d:%*xs:%.2f", rep->flag, rspamd_fuzzy_hash_len, cmd->digest, - rep->prob, - nval); + rep->prob); rspamd_task_insert_result_single (session->task, symbol, nval, diff --git a/src/rspamadm/signtool.c b/src/rspamadm/signtool.c index ba9fda5a9..5965a736b 100644 --- a/src/rspamadm/signtool.c +++ b/src/rspamadm/signtool.c @@ -551,7 +551,8 @@ rspamadm_signtool (gint argc, gchar **argv) if (pk == NULL) { rspamd_fprintf (stderr, "bad size %s: %ud, %ud expected\n", - strlen (pubkey), + pubkey_file, + (guint)strlen (pubkey), rspamd_cryptobox_pk_sig_bytes (mode)); exit (errno); } -- 2.39.5