From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 17 Jan 2009 11:15:49 +0000 (+0100)
Subject: bind plugin: Put removal of special characters in separate function.
X-Git-Tag: collectd-4.6.0~98^2~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=8f9fc8e34747d69dd8fee425a85deb04fc226447;hp=c99971391922c90a3ec8660ad0036b10bbaa0a0a

bind plugin: Put removal of special characters in separate function.
---

diff --git a/src/bind.c b/src/bind.c
index 43b61dd2..d6914999 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -76,12 +76,24 @@ static const char *config_keys[] =
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
+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] = '_';
+  }
+} /* void remove_special */
+
 static void submit_counter(time_t ts, const char *plugin_instance, const char *type,
     const char *type_instance, counter_t value)
 {
   value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
-  char *p;
 
   values[0].counter = value;
 
@@ -93,17 +105,13 @@ static void submit_counter(time_t ts, const char *plugin_instance, const char *t
   if (plugin_instance) {
     sstrncpy(vl.plugin_instance, plugin_instance,
         sizeof(vl.plugin_instance));
-    for (p = vl.type_instance; *p; p++)
-      if ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')  && (*p < '0' || *p > '9') && *p != '_')
-        *p = '_';
+    remove_special (vl.plugin_instance, sizeof (vl.plugin_instance));
   }
   sstrncpy(vl.type, type, sizeof(vl.type));
   if (type_instance) {
     sstrncpy(vl.type_instance, type_instance,
         sizeof(vl.type_instance));
-    for (p = vl.type_instance; *p; p++)
-      if ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')  && (*p < '0' || *p > '9') && *p != '_')
-        *p = '_';
+    remove_special (vl.plugin_instance, sizeof (vl.plugin_instance));
   }
   plugin_dispatch_values(&vl);
 } /* void submit_counter */