Merge branch 'collectd-5.5'

[collectd.git] / src / daemon / utils_ignorelist.c

diff --git a/src/daemon/utils_ignorelist.c b/src/daemon/utils_ignorelist.c
index 6b5e894..1268838 100644 (file)
--- a/src/daemon/utils_ignorelist.c
+++ b/src/daemon/utils_ignorelist.c
@@ -13,10 +13,9 @@
  * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public Licence for more details.
  *
- * You should have received a copy of the GNU General Public
- * Licence along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- * USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
  *   Lubos Stanek <lubek at users.sourceforge.net>
@@ -89,50 +88,45 @@ static inline void ignorelist_append (ignorelist_t *il, ignorelist_item_t *item)
 }
 
 #if HAVE_REGEX_H
-static int ignorelist_append_regex(ignorelist_t *il, const char *entry)
+static int ignorelist_append_regex(ignorelist_t *il, const char *re_str)
 {
        regex_t *re;
-       ignorelist_item_t *item;
+       ignorelist_item_t *entry;
        int status;
 
-       /* create buffer */
        re = malloc (sizeof (*re));
        if (re == NULL)
        {
                ERROR ("ignorelist_append_regex: malloc failed.");
-               return ENOMEM;
+               return (ENOMEM);
        }
        memset (re, 0, sizeof (*re));
 
-       /* compile regex */
-       status = regcomp (re, entry, REG_EXTENDED);
+       status = regcomp (re, re_str, REG_EXTENDED);
        if (status != 0)
        {
                char errbuf[1024];
-
                (void) regerror (status, re, errbuf, sizeof (errbuf));
-               ERROR ("ignorelist_append_regex: Compiling regular expression \"%s\" failed: %s", entry, errbuf);
+               ERROR ("utils_ignorelist: regcomp failed: %s", errbuf);
+               ERROR ("ignorelist_append_regex: Compiling regular expression \"%s\" failed: %s", re_str, errbuf);
                sfree (re);
-               return status;
+               return (status);
        }
 
-       /* create new entry */
-       item = malloc (sizeof (*item));
-       if (item == NULL)
+       entry = malloc (sizeof (*entry));
+       if (entry == NULL)
        {
                ERROR ("ignorelist_append_regex: malloc failed.");
                regfree (re);
                sfree (re);
-               return ENOMEM;
+               return (ENOMEM);
        }
-       memset (item, 0, sizeof (*item));
-       item->rmatch = re;
-
-       /* append new entry */
-       ignorelist_append (il, item);
+       memset (entry, 0, sizeof (*entry));
+       entry->rmatch = re;
 
+       ignorelist_append (il, entry);
        return (0);
-} /* int ignorelist_append_regex(ignorelist_t *il, const char *entry) */
+} /* int ignorelist_append_regex */
 #endif
 
 static int ignorelist_append_string(ignorelist_t *il, const char *entry)
@@ -264,7 +258,7 @@ void ignorelist_set_invert (ignorelist_t *il, int invert)
 
 /*
  * append entry into ignorelist_t
- * return 1 for success
+ * return 0 for success
  */
 int ignorelist_add (ignorelist_t *il, const char *entry)
 {