Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/collectors/log2journal/log2journal-rename.c b/src/collectors/log2journal/log2journal-rename.c
index c6975779f..11b3d2178 100644
--- a/src/collectors/log2journal/log2journal-rename.c
+++ b/src/collectors/log2journal/log2journal-rename.c
@@ -9,13 +9,13 @@ void rename_cleanup(RENAME *rn) {
 
 bool log_job_rename_add(LOG_JOB *jb, const char *new_key, size_t new_key_len, const char *old_key, size_t old_key_len) {
     if(jb->renames.used >= MAX_RENAMES) {
-        log2stderr("Error: too many renames. You can rename up to %d fields.", MAX_RENAMES);
+        l2j_log("Error: too many renames. You can rename up to %d fields.", MAX_RENAMES);
         return false;
     }
 
     RENAME *rn = &jb->renames.array[jb->renames.used++];
-    hashed_key_len_set(&rn->new_key, new_key, new_key_len);
-    hashed_key_len_set(&rn->old_key, old_key, old_key_len);
+    hashed_key_set(&rn->new_key, new_key, new_key_len);
+    hashed_key_set(&rn->old_key, old_key, old_key_len);
 
     return true;
 }