summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Kobal <vlad@prokk.net>2022-05-12 15:08:38 +0300
committerGitHub <noreply@github.com>2022-05-12 14:08:38 +0200
commita68ae03b9c710ffc6ff634a9ebdcf030dd5808ff (patch)
tree6e97c90689cd935af7b6cba720efcbc93773164a
parentb3c1cf515142d36740a8fb6b2717753176e8255d (diff)
Fix compilation warnings (#12886)
-rw-r--r--database/rrd.h3
-rw-r--r--database/rrddim.c7
-rw-r--r--ml/Dimension.h2
-rw-r--r--ml/ml.h4
-rw-r--r--parser/parser.c2
5 files changed, 7 insertions, 11 deletions
diff --git a/database/rrd.h b/database/rrd.h
index a4c0315a10..a2faf572d3 100644
--- a/database/rrd.h
+++ b/database/rrd.h
@@ -1293,8 +1293,7 @@ extern avl_tree_lock rrdhost_root_index;
extern char *rrdset_strncpyz_name(char *to, const char *from, size_t length);
extern char *rrdset_cache_dir(RRDHOST *host, const char *id);
-#define rrddim_free(st, rd) rrddim_free_custom(st, rd, 0)
-extern void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated);
+extern void rrddim_free(RRDSET *st, RRDDIM *rd);
extern int rrddim_compare(void* a, void* b);
extern int rrdset_compare(void* a, void* b);
diff --git a/database/rrddim.c b/database/rrddim.c
index 23567bbbb4..0a25e17939 100644
--- a/database/rrddim.c
+++ b/database/rrddim.c
@@ -369,13 +369,10 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte
// ----------------------------------------------------------------------------
// RRDDIM remove / free a dimension
-void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated)
+void rrddim_free(RRDSET *st, RRDDIM *rd)
{
ml_delete_dimension(rd);
-
-#ifndef ENABLE_ACLK
- UNUSED(db_rotated);
-#endif
+
debug(D_RRD_CALLS, "rrddim_free() %s.%s", st->name, rd->name);
if (!rrddim_flag_check(rd, RRDDIM_FLAG_ARCHIVED)) {
diff --git a/ml/Dimension.h b/ml/Dimension.h
index c29df781a4..e4f8bd1c70 100644
--- a/ml/Dimension.h
+++ b/ml/Dimension.h
@@ -48,7 +48,7 @@ public:
}
virtual ~RrdDimension() {
- rrddim_free_custom(AnomalyRateRD->rrdset, AnomalyRateRD, 0);
+ rrddim_free(AnomalyRateRD->rrdset, AnomalyRateRD);
}
private:
diff --git a/ml/ml.h b/ml/ml.h
index 4b33b2236b..e07eb094e9 100644
--- a/ml/ml.h
+++ b/ml/ml.h
@@ -10,9 +10,9 @@ extern "C" {
#include "daemon/common.h"
#include "web/api/queries/rrdr.h"
-// This is an internal DBEngine function redeclared here so that we can free
+// This is a DBEngine function redeclared here so that we can free
// the anomaly rate dimension, whenever its backing dimension is freed.
-extern void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated);
+extern void rrddim_free(RRDSET *st, RRDDIM *rd);
typedef void* ml_host_t;
typedef void* ml_dimension_t;
diff --git a/parser/parser.c b/parser/parser.c
index 0707f71727..00440824c6 100644
--- a/parser/parser.c
+++ b/parser/parser.c
@@ -268,7 +268,7 @@ inline int parser_action(PARSER *parser, char *input)
uint32_t command_hash = simple_hash(command);
- size_t worker_job_id;
+ size_t worker_job_id = 0;
while(tmp_keyword) {
if (command_hash == tmp_keyword->keyword_hash &&
(!strcmp(command, tmp_keyword->keyword))) {