From: Florian Forster <octo@collectd.org>
Date: Mon, 21 Jan 2013 09:29:30 +0000 (+0100)
Subject: src/plugin.[ch]: Remove the plugin_dispatch_values_secure() function.
X-Git-Tag: collectd-5.3.0~57
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d37b132aaff8ff2bbf7c3181855857c486f35121;p=collectd.git

src/plugin.[ch]: Remove the plugin_dispatch_values_secure() function.

Since values are now *always* copied, we don't need the secure version
anymore.
---

diff --git a/src/aggregation.c b/src/aggregation.c
index 96dc3378..0c0f19d6 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -367,7 +367,7 @@ static int agg_instance_read_func (agg_instance_t *inst, /* {{{ */
   vl->values = &v;
   vl->values_len = 1;
 
-  plugin_dispatch_values_secure (vl);
+  plugin_dispatch_values (vl);
 
   vl->values = NULL;
   vl->values_len = 0;
diff --git a/src/network.c b/src/network.c
index 72e3484e..8a5bc6af 100644
--- a/src/network.c
+++ b/src/network.c
@@ -460,7 +460,7 @@ static int network_dispatch_values (value_list_t *vl, /* {{{ */
     }
   }
 
-  plugin_dispatch_values_secure (vl);
+  plugin_dispatch_values (vl);
   stats_values_dispatched++;
 
   meta_data_destroy (vl->meta);
@@ -3318,13 +3318,13 @@ static int network_stats_read (void) /* {{{ */
 	vl.values[0].derive = (derive_t) copy_octets_rx;
 	vl.values[1].derive = (derive_t) copy_octets_tx;
 	sstrncpy (vl.type, "if_octets", sizeof (vl.type));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	/* Packets received / send */
 	vl.values[0].derive = (derive_t) copy_packets_rx;
 	vl.values[1].derive = (derive_t) copy_packets_tx;
 	sstrncpy (vl.type, "if_packets", sizeof (vl.type));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	/* Values (not) dispatched and (not) send */
 	sstrncpy (vl.type, "total_values", sizeof (vl.type));
@@ -3333,28 +3333,28 @@ static int network_stats_read (void) /* {{{ */
 	vl.values[0].derive = (derive_t) copy_values_dispatched;
 	sstrncpy (vl.type_instance, "dispatch-accepted",
 			sizeof (vl.type_instance));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	vl.values[0].derive = (derive_t) copy_values_not_dispatched;
 	sstrncpy (vl.type_instance, "dispatch-rejected",
 			sizeof (vl.type_instance));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	vl.values[0].derive = (derive_t) copy_values_sent;
 	sstrncpy (vl.type_instance, "send-accepted",
 			sizeof (vl.type_instance));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	vl.values[0].derive = (derive_t) copy_values_not_sent;
 	sstrncpy (vl.type_instance, "send-rejected",
 			sizeof (vl.type_instance));
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	/* Receive queue length */
 	vl.values[0].gauge = (gauge_t) copy_receive_list_length;
 	sstrncpy (vl.type, "queue_length", sizeof (vl.type));
 	vl.type_instance[0] = 0;
-	plugin_dispatch_values_secure (&vl);
+	plugin_dispatch_values (&vl);
 
 	return (0);
 } /* }}} int network_stats_read */
diff --git a/src/nfs.c b/src/nfs.c
index 461e806f..5c6f6207 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -246,7 +246,7 @@ static void nfs_procedures_submit (const char *plugin_instance,
 		vl.values = values + i;
 		sstrncpy (vl.type_instance, type_instances[i],
 				sizeof (vl.type_instance));
-		plugin_dispatch_values_secure (&vl);
+		plugin_dispatch_values (&vl);
 	}
 } /* void nfs_procedures_submit */
 
diff --git a/src/plugin.c b/src/plugin.c
index 0aa33b1d..547b5eb5 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1936,11 +1936,6 @@ int plugin_dispatch_values (value_list_t const *vl)
 	return (0);
 }
 
-int plugin_dispatch_values_secure (const value_list_t *vl)
-{
-  return (plugin_dispatch_values (vl));
-} /* int plugin_dispatch_values_secure */
-
 int plugin_dispatch_notification (const notification_t *notif)
 {
 	llentry_t *le;
diff --git a/src/plugin.h b/src/plugin.h
index c28709e0..635ff308 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -327,7 +327,6 @@ int plugin_unregister_notification (const char *name);
  *              function.
  */
 int plugin_dispatch_values (value_list_t const *vl);
-int plugin_dispatch_values_secure (const value_list_t *vl);
 int plugin_dispatch_missing (const value_list_t *vl);
 
 int plugin_dispatch_notification (const notification_t *notif);