X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftape.c;h=52da2bc69db465a6e99bf97e529f43c56a0cd5c8;hb=43954e07f30d05b2da8319749400c9bf4d01c23c;hp=c374d59820e6dd1d7bc93083d831081594f2dec8;hpb=2354eda94fa44c8bcb8e39b24b117e7937110224;p=collectd.git

diff --git a/src/tape.c b/src/tape.c
index c374d598..52da2bc6 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -58,22 +59,21 @@ 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;
+	values[0].derive = read;
+	values[1].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,
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "tape", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
-	strncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	plugin_dispatch_values (&vl);
 } /* void tape_submit */
@@ -99,7 +99,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);
@@ -107,7 +106,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;