X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmatch_regex.c;h=1defc18026241e6580e777b6ec8324c84c1411b7;hb=5e83b286691cd53454a3864af3b01451a8ff1946;hp=3b6db4337cdbd0b982cad7cbaa944fcedce3648d;hpb=ad4295bdbc56ad7286446b0b5d5e06c8c27b084a;p=collectd.git

diff --git a/src/match_regex.c b/src/match_regex.c
index 3b6db433..1defc180 100644
--- a/src/match_regex.c
+++ b/src/match_regex.c
@@ -58,7 +58,7 @@ struct mr_match_s
 	mr_regex_t *plugin_instance;
 	mr_regex_t *type;
 	mr_regex_t *type_instance;
-	int invert;
+	_Bool invert;
 };
 
 /*
@@ -123,25 +123,6 @@ static int mr_match_regexen (mr_regex_t *re_head, /* {{{ */
 	return (FC_MATCH_MATCHES);
 } /* }}} int mr_match_regexen */
 
-static int mr_config_add_boolean (int *ret_value, /* {{{ */
-    oconfig_item_t *ci)
-{
-
-  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
-  {
-    ERROR ("`regex' match: `%s' needs exactly one boolean argument.",
-        ci->key);
-    return (-1);
-  }
-
-  if (ci->values[0].value.boolean)
-    *ret_value = 1;
-  else
-    *ret_value = 0;
-
-  return (0);
-} /* }}} int mv_config_add_boolean */
-
 static int mr_config_add_regex (mr_regex_t **re_head, /* {{{ */
 		oconfig_item_t *ci)
 {
@@ -216,7 +197,7 @@ static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
 	}
 	memset (m, 0, sizeof (*m));
 	
-  m->invert = 0;
+	m->invert = 0;
 
 	status = 0;
 	for (i = 0; i < ci->children_num; i++)
@@ -235,7 +216,7 @@ static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
 		else if (strcasecmp ("TypeInstance", child->key) == 0)
 			status = mr_config_add_regex (&m->type_instance, child);
 		else if (strcasecmp ("Invert", child->key) == 0)
-      status = mr_config_add_boolean(&m->invert, child);
+			status = cf_util_get_boolean(child, &m->invert);
 		else
 		{
 			log_err ("The `%s' configuration option is not understood and "
@@ -287,21 +268,20 @@ static int mr_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */
 		void **user_data)
 {
 	mr_match_t *m;
+	int match_value = FC_MATCH_MATCHES;
+	int nomatch_value = FC_MATCH_NO_MATCH;
 
 	if ((user_data == NULL) || (*user_data == NULL))
 		return (-1);
 
 	m = *user_data;
-	
-  int match_value = FC_MATCH_MATCHES;
-  int nomatch_value = FC_MATCH_NO_MATCH;
-  
-  if (m->invert)
-  {
-    match_value = FC_MATCH_NO_MATCH;
-    nomatch_value = FC_MATCH_MATCHES;
-  }
-  
+
+	if (m->invert)
+	{
+		match_value = FC_MATCH_NO_MATCH;
+		nomatch_value = FC_MATCH_MATCHES;
+	}
+
 	if (mr_match_regexen (m->host, vl->host) == FC_MATCH_NO_MATCH)
 		return (nomatch_value);
 	if (mr_match_regexen (m->plugin, vl->plugin) == FC_MATCH_NO_MATCH)