From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 5 Nov 2020 16:56:29 +0000 (+0100)
Subject: Avoid shadow parameter in BDB::bdb_create_log_record()
X-Git-Tag: Release-11.3.2~864
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=984dddb64eee2eb46887856a5f9cdc301e58c6e5;p=thirdparty%2Fbacula.git

Avoid shadow parameter in BDB::bdb_create_log_record()
---

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 919fd98da..ff4ac4eae 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -1408,7 +1408,7 @@ bail_out:
 bool BDB::bdb_create_log_record(JCR *jcr, JobId_t jobid, utime_t mtime, char *msg) 
 {
    bool ret;
-   POOLMEM *cmd = get_pool_memory(PM_MESSAGE);
+   POOLMEM *tmp = get_pool_memory(PM_MESSAGE);
    POOLMEM *esc_msg = get_pool_memory(PM_MESSAGE);
    char dt[MAX_TIME_LENGTH], ed1[50];
    int len = strlen(msg) + 1;
@@ -1416,12 +1416,12 @@ bool BDB::bdb_create_log_record(JCR *jcr, JobId_t jobid, utime_t mtime, char *ms
    esc_msg = check_pool_memory_size(esc_msg, len*2+1);
    bdb_escape_string(jcr, esc_msg, msg, len);
    bstrutime(dt, sizeof(dt), mtime);
-   Mmsg(cmd, "INSERT INTO Log (JobId, Time, LogText) VALUES (%s,'%s','%s')",
+   Mmsg(tmp, "INSERT INTO Log (JobId, Time, LogText) VALUES (%s,'%s','%s')",
         edit_int64(jcr->JobId, ed1), dt, esc_msg);
 
-   ret = bdb_sql_query(cmd, NULL, NULL);
+   ret = bdb_sql_query(tmp, NULL, NULL);
 
-   free_pool_memory(cmd);
+   free_pool_memory(tmp);
    free_pool_memory(esc_msg);
    return ret; 
 }