From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 5 Dec 2010 10:20:49 +0000 (+0100)
Subject: src/common.h: NOTIFICATION_INIT_VL: Remove the "ds" argument.
X-Git-Tag: collectd-5.0.0-beta0~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=83ca15b62cd8477613a8b81d46558041bb63d517;p=collectd.git

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 425d6e2d..e6b899de 100644
--- 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);
-#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, \
-			(ds)->type, (vl)->type_instance)
+			(vl)->type, (vl)->type_instance)
 
 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 89397502..7d48244c 100644
--- 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);
 
-  NOTIFICATION_INIT_VL (&n, vl, ds);
+  NOTIFICATION_INIT_VL (&n, vl);
 
   buf = n.message;
   bufsize = sizeof (n.message);