From d499d94a44d02ccdda2bc98ce304f572cb87eaed Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Tue, 1 Sep 2020 17:25:47 +0200 Subject: [PATCH] Rewrite problematic language where possible This patch leaves out rewrite master/slave from mysql and also master from snmp. --- docs/BUILD.dpdkstat.md | 2 +- src/collectd-snmp.pod | 4 ++-- src/utils/format_stackdriver/format_stackdriver.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/BUILD.dpdkstat.md b/docs/BUILD.dpdkstat.md index 457fc0fa3..582d04c6b 100644 --- a/docs/BUILD.dpdkstat.md +++ b/docs/BUILD.dpdkstat.md @@ -217,7 +217,7 @@ See also: http://dpdk.org/doc/guides/prog_guide/multi_proc_support.html * The same PCI device configuration should be passed to the primary process as the secondary process uses the same port indexes as the primary. - * A blacklist / whitelist of NICs isn't supported yet. + * A deny-list / allow-list of NICs isn't supported yet. * Plugin initialization time depends on read interval. It requires 5 read cycles to set up internal buffers and states. During that time no statistics are submitted. diff --git a/src/collectd-snmp.pod b/src/collectd-snmp.pod index 53689c199..7a5f583df 100644 --- a/src/collectd-snmp.pod +++ b/src/collectd-snmp.pod @@ -302,8 +302,8 @@ When B is set to I then this option has no effect. =item B I The invertmatch value should be use in combination of the Ignore option. -It changes the behaviour of the Ignore option, from a blacklist behaviour -when InvertMatch is set to false, to a whitelist when specified to true. +It changes the behaviour of the Ignore option, from a deny-list behaviour +when InvertMatch is set to false, to a allow-list when specified to true. =item B I diff --git a/src/utils/format_stackdriver/format_stackdriver.c b/src/utils/format_stackdriver/format_stackdriver.c index 3c45aacb4..907a23cba 100644 --- a/src/utils/format_stackdriver/format_stackdriver.c +++ b/src/utils/format_stackdriver/format_stackdriver.c @@ -217,12 +217,12 @@ static int metric_type(char *buffer, size_t buffer_size, data_set_t const *ds, ssnprintf(buffer, buffer_size, GCM_PREFIX "%s/%s", vl->plugin, vl->type); } - char const *whitelist = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + char const *allowlist = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789_/"; char *ptr = buffer + strlen(GCM_PREFIX); size_t ok_len; - while ((ok_len = strspn(ptr, whitelist)) != strlen(ptr)) { + while ((ok_len = strspn(ptr, allowlist)) != strlen(ptr)) { ptr[ok_len] = '_'; ptr += ok_len; } -- 2.39.5