Merge branch 'collectd-5.1' into collectd-5.2

[collectd.git] / src / utils_vl_lookup.c

diff --git a/src/utils_vl_lookup.c b/src/utils_vl_lookup.c
index 5a6671f..2dada24 100644 (file)
--- a/src/utils_vl_lookup.c
+++ b/src/utils_vl_lookup.c
@@ -84,10 +84,6 @@ struct by_type_entry_s
 };
 typedef struct by_type_entry_s by_type_entry_t;
 
-#define LU_IS_ANY(str) (strcmp (str, "/any/") == 0)
-#define LU_IS_ALL(str) (strcmp (str, "/all/") == 0)
-#define LU_IS_WILDCARD(str) (LU_IS_ANY(str) || LU_IS_ALL(str))
-
 /*
  * Private functions
  */
@@ -203,7 +199,8 @@ static int lu_handle_user_class (lookup_t *obj, /* {{{ */
       return (-1);
   }
 
-  status = obj->cb_user_obj (ds, vl, user_class, user_obj);
+  status = obj->cb_user_obj (ds, vl,
+      user_class->user_class, user_obj->user_obj);
   if (status != 0)
   {
     ERROR ("utils_vl_lookup: The user object callback failed with status %i.",