src/common.h: NOTIFICATION_INIT_VL: Remove the "ds" argument.

Since "type" is now included in "value_list_t", too, we don't need a
"data_set_t" to initialize the notification.

diff --git a/src/common.h b/src/common.h
index 425d6e2..e6b899d 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -278,10 +278,10 @@ int notification_init (notification_t *n, int severity, const char *message,
                const char *host,
                const char *plugin, const char *plugin_instance,
                const char *type, const char *type_instance);
                const char *host,
                const char *plugin, const char *plugin_instance,
                const char *type, const char *type_instance);

-#define NOTIFICATION_INIT_VL(n, vl, ds) \
+#define NOTIFICATION_INIT_VL(n, vl) \

        notification_init (n, NOTIF_FAILURE, NULL, \
                        (vl)->host, (vl)->plugin, (vl)->plugin_instance, \
        notification_init (n, NOTIF_FAILURE, NULL, \
                        (vl)->host, (vl)->plugin, (vl)->plugin_instance, \

-                       (ds)->type, (vl)->type_instance)
+                       (vl)->type, (vl)->type_instance)

 
 typedef int (*dirwalk_callback_f)(const char *dirname, const char *filename,
                void *user_data);
 
 typedef int (*dirwalk_callback_f)(const char *dirname, const char *filename,
                void *user_data);

diff --git a/src/threshold.c b/src/threshold.c
index 8939750..7d48244 100644 (file)
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -628,7 +628,7 @@ static int ut_report_state (const data_set_t *ds,
   if (state != state_old)
     uc_set_state (ds, vl, state);
 
   if (state != state_old)
     uc_set_state (ds, vl, state);
 

-  NOTIFICATION_INIT_VL (&n, vl, ds);
+  NOTIFICATION_INIT_VL (&n, vl);

 
   buf = n.message;
   bufsize = sizeof (n.message);
 
   buf = n.message;
   bufsize = sizeof (n.message);