X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_ignorelist.c;h=bf39597e914ec0381274e105ac7dfe6686ec3574;hb=2e8ad93a2f3856644a74fb508d10a9e8e4704293;hp=7f9e5c6d7adcdffdc092c3c75992f829a906faff;hpb=9e7918de3468233376be0cb0c7c7ab5a06ef8bce;p=collectd.git

diff --git a/src/utils_ignorelist.c b/src/utils_ignorelist.c
index 7f9e5c6d..bf39597e 100644
--- a/src/utils_ignorelist.c
+++ b/src/utils_ignorelist.c
@@ -48,11 +48,11 @@
  **/
 
 #if HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include "common.h"
-#include "utils_debug.h"
+#include "plugin.h"
 #include "utils_ignorelist.h"
 
 /*
@@ -98,7 +98,7 @@ static int ignorelist_append_regex(ignorelist_t *il, const char *entry)
 	/* create buffer */
 	if ((regtemp = malloc(sizeof(regex_t))) == NULL)
 	{
-		syslog (LOG_ERR, "cannot allocate new config entry");
+		ERROR ("cannot allocate new config entry");
 		return (1);
 	}
 	memset (regtemp, '\0', sizeof(regex_t));
@@ -115,14 +115,14 @@ static int ignorelist_append_regex(ignorelist_t *il, const char *entry)
 		{
 			fprintf (stderr, "Cannot compile regex %s: %i/%s",
 					entry, rcompile, regerr);
-			syslog (LOG_ERR, "Cannot compile regex %s: %i/%s",
+			ERROR ("Cannot compile regex %s: %i/%s",
 					entry, rcompile, regerr);
 		}
 		else
 		{
 			fprintf (stderr, "Cannot compile regex %s: %i",
 					entry, rcompile);
-			syslog (LOG_ERR, "Cannot compile regex %s: %i",
+			ERROR ("Cannot compile regex %s: %i",
 					entry, rcompile);
 		}
 
@@ -131,12 +131,12 @@ static int ignorelist_append_regex(ignorelist_t *il, const char *entry)
 		regfree (regtemp);
 		return (1);
 	}
-	DBG("regex compiled: %s - %i", entry, rcompile);
+	DEBUG("regex compiled: %s - %i", entry, rcompile);
 
 	/* create new entry */
 	if ((new = malloc(sizeof(ignorelist_item_t))) == NULL)
 	{
-		syslog (LOG_ERR, "cannot allocate new config entry");
+		ERROR ("cannot allocate new config entry");
 		regfree (regtemp);
 		return (1);
 	}
@@ -157,7 +157,7 @@ static int ignorelist_append_string(ignorelist_t *il, const char *entry)
 	/* create new entry */
 	if ((new = malloc(sizeof(ignorelist_item_t))) == NULL )
 	{
-		syslog (LOG_ERR, "cannot allocate new entry");
+		ERROR ("cannot allocate new entry");
 		return (1);
 	}
 	memset (new, '\0', sizeof(ignorelist_item_t));
@@ -217,7 +217,7 @@ ignorelist_t *ignorelist_create (int invert)
 
 	/* smalloc exits if it failes */
 	il = (ignorelist_t *) smalloc (sizeof (ignorelist_t));
-	DBG("Ignorelist created 0x%p, default is %s",
+	DEBUG("Ignorelist created 0x%p, default is %s",
 			(void *) il,
 			invert ? "collect" : "ignore");
 
@@ -240,8 +240,6 @@ void ignorelist_free (ignorelist_t *il)
 	ignorelist_item_t *this;
 	ignorelist_item_t *next;
 
-	DBG ("(il = 0x%p)", (void *) il);
-
 	if (il == NULL)
 		return;
 
@@ -274,7 +272,7 @@ void ignorelist_set_invert (ignorelist_t *il, int invert)
 {
 	if (il == NULL)
 	{
-		DBG("ignore call with ignorelist_t == NULL");
+		DEBUG("ignore call with ignorelist_t == NULL");
 		return;
 	}
 
@@ -292,7 +290,7 @@ int ignorelist_add (ignorelist_t *il, const char *entry)
 
 	if (il == NULL)
 	{
-		DBG ("add called with ignorelist_t == NULL");
+		DEBUG ("add called with ignorelist_t == NULL");
 		return (1);
 	}
 
@@ -301,7 +299,7 @@ int ignorelist_add (ignorelist_t *il, const char *entry)
 	/* append nothing */
 	if (entry_len == 0)
 	{
-		DBG("not appending: empty entry");
+		DEBUG("not appending: empty entry");
 		return (1);
 	}
 
@@ -316,14 +314,14 @@ int ignorelist_add (ignorelist_t *il, const char *entry)
 		memset (entry_copy, '\0', entry_len);
 		strncpy (entry_copy, entry + 1, entry_len - 2);
 
-		DBG("I'm about to add regex entry: %s", entry_copy);
+		DEBUG("I'm about to add regex entry: %s", entry_copy);
 		ret = ignorelist_append_regex(il, entry_copy);
 		sfree (entry_copy);
 	}
 	else
 #endif
 	{
-		DBG("to add entry: %s", entry);
+		DEBUG("to add entry: %s", entry);
 		ret = ignorelist_append_string(il, entry);
 	}