[Minor] Some more fixes

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index fb028ccedb9f0d1b110cb0788956d380aed94a31..c6f58b1969156a30633e7e8c283166cbe6e9a02a 100644 (file)
--- 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 09f7b8a3655241d74ba38ba2e4f11c95cbd45e93..04ebe72afd8e3425f54b186d97c5ccd90a4ffdf6 100644 (file)
--- 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 3b0121f15605bce44d40fe0daa2b29dbd63d9dbd..bd142084711488d5a1ecdce651ff14c877810a49 100644 (file)
--- 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 ba9fda5a97c3487d3c5af7ca89a6e2b7736f68b1..5965a736b2995230f09b6d82a299b6a311866d6f 100644 (file)
--- 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);
                        }