Use a parameter name that is not a reserved keyword in C++ (#10738)
vkalintiris committed
Mar 9, 2021 at 17:40 UTC
2ccc5a4d9ea781c2c20f9c47f56b2eea087de39a
2 files changed
+6
-6
database/rrd.h
+2
-2
@@ -1004,13 +1004,13 @@ extern void rrdhost_free_all(void);
1004
extern void rrdhost_save_all(void);
1005
extern void rrdhost_cleanup_all(void);
1006
1007
-extern void rrdhost_cleanup_orphan_hosts_nolock(RRDHOST *protected);
1007
+extern void rrdhost_cleanup_orphan_hosts_nolock(RRDHOST *protected_host);
1008
extern void rrdhost_system_info_free(struct rrdhost_system_info *system_info);
1009
extern void rrdhost_free(RRDHOST *host);
1010
extern void rrdhost_save_charts(RRDHOST *host);
1011
extern void rrdhost_delete_charts(RRDHOST *host);
1012
1013
-extern int rrdhost_should_be_removed(RRDHOST *host, RRDHOST *protected, time_t now);
1013
+extern int rrdhost_should_be_removed(RRDHOST *host, RRDHOST *protected_host, time_t now);
1014
1015
extern void rrdset_update_heterogeneous_flag(RRDSET *st);
1016
database/rrdhost.c
+4
-4
@@ -582,8 +582,8 @@ RRDHOST *rrdhost_find_or_create(
582
583
return host;
584
}
585
-inline int rrdhost_should_be_removed(RRDHOST *host, RRDHOST *protected, time_t now) {
586
- if(host != protected
585
+inline int rrdhost_should_be_removed(RRDHOST *host, RRDHOST *protected_host, time_t now) {
586
+ if(host != protected_host
587
&& host != localhost
588
&& rrdhost_flag_check(host, RRDHOST_FLAG_ORPHAN)
589
&& host->receiver
@@ -594,14 +594,14 @@ inline int rrdhost_should_be_removed(RRDHOST *host, RRDHOST *protected, time_t n
594
return 0;
595
}
596
597
-void rrdhost_cleanup_orphan_hosts_nolock(RRDHOST *protected) {
597
+void rrdhost_cleanup_orphan_hosts_nolock(RRDHOST *protected_host) {
598
time_t now = now_realtime_sec();
599
600
RRDHOST *host;
601
602
restart_after_removal:
603
rrdhost_foreach_write(host) {
604
- if(rrdhost_should_be_removed(host, protected, now)) {
604
+ if(rrdhost_should_be_removed(host, protected_host, now)) {
605
info("Host '%s' with machine guid '%s' is obsolete - cleaning up.", host->hostname, host->machine_guid);
606
607
if (rrdhost_flag_check(host, RRDHOST_FLAG_DELETE_ORPHAN_HOST)