summaryrefslogtreecommitdiffstats
path: root/database
diff options
context:
space:
mode:
authorvkalintiris <vasilis@netdata.cloud>2021-04-23 16:16:40 +0300
committerGitHub <noreply@github.com>2021-04-23 16:16:40 +0300
commit7b6362767e71b09ad1604de45c754e798c7dd169 (patch)
treed35af2e563d0b47d38722f3613b3e6e33ab4e7a0 /database
parent3ec43de2167e3f9ad095bff05d7285e33e26cd69 (diff)
Rename struct fields from class to classification. (#11019)
These fields made our headers incompatible with C++, because `class` is a reserved keyword.
Diffstat (limited to 'database')
-rw-r--r--database/rrd.h2
-rw-r--r--database/rrdcalc.c10
-rw-r--r--database/rrdcalc.h2
-rw-r--r--database/rrdcalctemplate.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/database/rrd.h b/database/rrd.h
index ce0ef44821..d4a3d62179 100644
--- a/database/rrd.h
+++ b/database/rrd.h
@@ -668,7 +668,7 @@ struct alarm_entry {
char *family;
- char *class;
+ char *classification;
char *component;
char *type;
diff --git a/database/rrdcalc.c b/database/rrdcalc.c
index 5455b1674c..85b9efb75c 100644
--- a/database/rrdcalc.c
+++ b/database/rrdcalc.c
@@ -91,7 +91,7 @@ static void rrdsetcalc_link(RRDSET *st, RRDCALC *rc) {
rc->name,
rc->rrdset->id,
rc->rrdset->family,
- rc->class,
+ rc->classification,
rc->component,
rc->type,
rc->exec,
@@ -168,7 +168,7 @@ inline void rrdsetcalc_unlink(RRDCALC *rc) {
rc->name,
rc->rrdset->id,
rc->rrdset->family,
- rc->class,
+ rc->classification,
rc->component,
rc->type,
rc->exec,
@@ -434,7 +434,7 @@ inline RRDCALC *rrdcalc_create_from_template(RRDHOST *host, RRDCALCTEMPLATE *rt,
if(rt->units) rc->units = strdupz(rt->units);
if(rt->info) rc->info = strdupz(rt->info);
- if (rt->class) rc->class = strdupz(rt->class);
+ if (rt->classification) rc->classification = strdupz(rt->classification);
if (rt->component) rc->component = strdupz(rt->component);
if (rt->type) rc->type = strdupz(rt->type);
@@ -545,7 +545,7 @@ inline RRDCALC *rrdcalc_create_from_rrdcalc(RRDCALC *rc, RRDHOST *host, const ch
if(rc->units) newrc->units = strdupz(rc->units);
if(rc->info) newrc->info = strdupz(rc->info);
- if (rc->class) newrc->class = strdupz(rc->class);
+ if (rc->classification) newrc->classification = strdupz(rc->classification);
if (rc->component) newrc->component = strdupz(rc->component);
if (rc->type) newrc->type = strdupz(rc->type);
@@ -587,7 +587,7 @@ void rrdcalc_free(RRDCALC *rc) {
freez(rc->source);
freez(rc->units);
freez(rc->info);
- freez(rc->class);
+ freez(rc->classification);
freez(rc->component);
freez(rc->type);
simple_pattern_free(rc->spdim);
diff --git a/database/rrdcalc.h b/database/rrdcalc.h
index d3e53a0663..b4122c6056 100644
--- a/database/rrdcalc.h
+++ b/database/rrdcalc.h
@@ -42,7 +42,7 @@ struct rrdcalc {
char *exec; // the command to execute when this alarm switches state
char *recipient; // the recipient of the alarm (the first parameter to exec)
- char *class; // the class that this alarm belongs
+ char *classification; // the class that this alarm belongs
char *component; // the component that this alarm refers to
char *type; // type of the alarm
diff --git a/database/rrdcalctemplate.h b/database/rrdcalctemplate.h
index 7e01551ea3..64c201c8c0 100644
--- a/database/rrdcalctemplate.h
+++ b/database/rrdcalctemplate.h
@@ -15,7 +15,7 @@ struct rrdcalctemplate {
char *exec;
char *recipient;
- char *class;
+ char *classification;
char *component;
char *type;