Fix compilation warnings (#12886)
Vladimir Kobal committed
May 12, 2022 at 15:08 UTC
a68ae03b9c710ffc6ff634a9ebdcf030dd5808ff
5 files changed
+7
-11
database/rrd.h
+1
-2
@@ -1293,8 +1293,7 @@ extern avl_tree_lock rrdhost_root_index;
1293
extern char *rrdset_strncpyz_name(char *to, const char *from, size_t length);
1294
extern char *rrdset_cache_dir(RRDHOST *host, const char *id);
1295
1296
-#define rrddim_free(st, rd) rrddim_free_custom(st, rd, 0)
1297
-extern void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated);
1296
+extern void rrddim_free(RRDSET *st, RRDDIM *rd);
1297
1298
extern int rrddim_compare(void* a, void* b);
1299
extern int rrdset_compare(void* a, void* b);
database/rrddim.c
+2
-5
@@ -369,13 +369,10 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte
369
// ----------------------------------------------------------------------------
370
// RRDDIM remove / free a dimension
371
372
-void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated)
372
+void rrddim_free(RRDSET *st, RRDDIM *rd)
373
{
374
ml_delete_dimension(rd);
375
-
376
-#ifndef ENABLE_ACLK
377
- UNUSED(db_rotated);
378
-#endif
375
+
376
debug(D_RRD_CALLS, "rrddim_free() %s.%s", st->name, rd->name);
377
378
if (!rrddim_flag_check(rd, RRDDIM_FLAG_ARCHIVED)) {
ml/Dimension.h
+1
-1
@@ -48,7 +48,7 @@ public:
48
}
49
50
virtual ~RrdDimension() {
51
- rrddim_free_custom(AnomalyRateRD->rrdset, AnomalyRateRD, 0);
51
+ rrddim_free(AnomalyRateRD->rrdset, AnomalyRateRD);
52
}
53
54
private:
ml/ml.h
+2
-2
@@ -10,9 +10,9 @@ extern "C" {
10
#include "daemon/common.h"
11
#include "web/api/queries/rrdr.h"
12
13
-// This is an internal DBEngine function redeclared here so that we can free
13
+// This is a DBEngine function redeclared here so that we can free
14
// the anomaly rate dimension, whenever its backing dimension is freed.
15
-extern void rrddim_free_custom(RRDSET *st, RRDDIM *rd, int db_rotated);
15
+extern void rrddim_free(RRDSET *st, RRDDIM *rd);
16
17
typedef void* ml_host_t;
18
typedef void* ml_dimension_t;
parser/parser.c
+1
-1
@@ -268,7 +268,7 @@ inline int parser_action(PARSER *parser, char *input)
268
269
uint32_t command_hash = simple_hash(command);
270
271
- size_t worker_job_id;
271
+ size_t worker_job_id = 0;
272
while(tmp_keyword) {
273
if (command_hash == tmp_keyword->keyword_hash &&
274
(!strcmp(command, tmp_keyword->keyword))) {