Code

Fix conceptual buglet in default_callback
authorDavid Gibson <david@gibson.dropbear.id.au>
Wed, 10 Aug 2016 10:07:14 +0000 (20:07 +1000)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Aug 2016 08:04:56 +0000 (10:04 +0200)
The 'DERIVE' path in default_callback() increments the 'counter' field of
value instead of the 'derive' field.  Since those fields have the same
type and offset within the value union this will still work fine, but
AFAICT it's conceptually incorrect.  This corrects it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Florian Forster <octo@collectd.org>
src/daemon/utils_match.c

index 5083b05a7f7176886aa8016935de4e6563054c79..38472848a24c7fce26719fa1ae45b2ff74a27794 100644 (file)
@@ -169,7 +169,7 @@ static int default_callback (const char __attribute__((unused)) *str,
 
     if (data->ds_type & UTILS_MATCH_CF_DERIVE_INC)
     {
-      data->value.counter++;
+      data->value.derive++;
       data->values_num++;
       return (0);
     }