Merge branch 'collectd-4.6'

Conflicts:

	src/bind.c

diff --cc src/bind.c
index 13967bb1a624fdda73bb5a19fc36d318fd5d91a4,b464f8de64841f1b389a87e36eb85958db96018f..4b3662f9819f867abd8161aeb29f4817ce5641b6
--- 1/src/bind.c
--- 2/src/bind.c
+++ b/src/bind.c
@@@ -239,8 -239,21 +239,8 @@@ static int memsummary_translation_table
    STATIC_ARRAY_SIZE (memsummary_translation_table);
  /* }}} */
  
- static void submit_counter(time_t ts, const char *plugin_instance, /* {{{ */
-     const char *type, const char *type_instance, counter_t value)
 -static void remove_special (char *buffer, size_t buffer_size) /* {{{ */
 -{
 -  size_t i;
 -
 -  for (i = 0; i < buffer_size; i++)
 -  {
 -    if (buffer[i] == 0)
 -      return;
 -    if ((!isalnum ((int) buffer[i])) && (buffer[i] != '-'))
 -      buffer[i] = '_';
 -  }
 -} /* }}} void remove_special */
 -
+ static void submit (time_t ts, const char *plugin_instance, /* {{{ */
+     const char *type, const char *type_instance, value_t value)
  {
    value_t values[1];
    value_list_t vl = VALUE_LIST_INIT;
@@@ -261,10 -274,10 +261,10 @@@
    if (type_instance) {
      sstrncpy(vl.type_instance, type_instance,
          sizeof(vl.type_instance));
 -    remove_special (vl.plugin_instance, sizeof (vl.plugin_instance));
 +    replace_special (vl.plugin_instance, sizeof (vl.plugin_instance));
    }
    plugin_dispatch_values(&vl);
- } /* }}} void submit_counter */
+ } /* }}} void submit */
  
  static size_t bind_curl_callback (void *buf, size_t size, /* {{{ */
      size_t nmemb, void __attribute__((unused)) *stream)