X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftape.c;h=c7d56c736b4a1d1261b165517aede4b32ae7239a;hb=dc57f6e8f2394b51dd35d1d8231ef110c075b831;hp=465688ed5cf2a470df3430fed859c44f2b9f83e6;hpb=e6fc1600ee7bcde75c95db9b1f617caf78fc4c6a;p=collectd.git

diff --git a/src/tape.c b/src/tape.c
index 465688ed..c7d56c73 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -58,23 +59,22 @@ static int tape_init (void)
 
 static void tape_submit (const char *plugin_instance,
 		const char *type,
-		counter_t read, counter_t write)
+		derive_t read, derive_t write)
 {
-	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].counter = read;
-	values[1].counter = write;
+	value_t values[] = {
+		{ .derive = read },
+		{ .derive = write },
+	};
 
 	vl.values = values;
-	vl.values_len = 2;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "tape");
-	strncpy (vl.plugin_instance, plugin_instance,
+	vl.values_len = STATIC_ARRAY_SIZE (values);
+	sstrncpy (vl.plugin, "tape", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void tape_submit */
 
 static int tape_read (void)
@@ -98,7 +98,6 @@ static int tape_read (void)
 # error "kstat_io_t does not have the required members"
 #endif
 	static kstat_io_t kio;
-	int i;
 
 	if (kc == NULL)
 		return (-1);
@@ -106,7 +105,7 @@ static int tape_read (void)
 	if (numtape <= 0)
 		return (-1);
 
-	for (i = 0; i < numtape; i++)
+	for (int i = 0; i < numtape; i++)
 	{
 		if (kstat_read (kc, ksp[i], &kio) == -1)
 			continue;