netapp plugin: Subtract snap_norm_used from norm_used in any case.

[collectd.git] / src / match_regex.c

diff --git a/src/match_regex.c b/src/match_regex.c
index 4353b3a..1fca889 100644 (file)
--- a/src/match_regex.c
+++ b/src/match_regex.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/match_regex.c
  * Copyright (C) 2008  Sebastian Harl
+ * Copyright (C) 2008  Florian Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -105,10 +106,20 @@ static int mr_match_regexen (mr_regex_t *re_head, /* {{{ */
                                /* nmatch = */ 0, /* pmatch = */ NULL,
                                /* eflags = */ 0);
                if (status == 0)
-                       return (FC_MATCH_MATCHES);
+               {
+                       DEBUG ("regex match: Regular expression `%s' matches `%s'.",
+                                       re->re_str, string);
+               }
+               else
+               {
+                       DEBUG ("regex match: Regular expression `%s' does not match `%s'.",
+                                       re->re_str, string);
+                       return (FC_MATCH_NO_MATCH);
+               }
+
        }
 
-       return (FC_MATCH_NO_MATCH);
+       return (FC_MATCH_MATCHES);
 } /* }}} int mr_match_regexen */
 
 static int mr_config_add_regex (mr_regex_t **re_head, /* {{{ */
@@ -133,7 +144,7 @@ static int mr_config_add_regex (mr_regex_t **re_head, /* {{{ */
        re->next = NULL;
 
        re->re_str = strdup (ci->values[0].value.string);
-       if (re->re_str)
+       if (re->re_str == NULL)
        {
                free (re);
                log_err ("mr_config_add_regex: strdup failed.");
@@ -246,8 +257,10 @@ static int mr_destroy (void **user_data) /* {{{ */
        return (0);
 } /* }}} int mr_destroy */
 
-static int mr_match (const data_set_t *ds, const value_list_t *vl, /* {{{ */
-               notification_meta_t **meta, void **user_data)
+static int mr_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */
+               const value_list_t *vl,
+               notification_meta_t __attribute__((unused)) **meta,
+               void **user_data)
 {
        mr_match_t *m;