X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=f3c636ecce9cd14aead260b9cfdd3149750b5c31;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=77c7f48f92e3aee3be927e4b34be9c1fa89b01d7;hpb=7c6b8505e5557622158574c8dce8ba53c53cec72;p=collectd.git

diff --git a/src/nfs.c b/src/nfs.c
index 77c7f48f..f3c636ec 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -187,21 +187,21 @@ static void nfs_procedures_submit (const char *plugin_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "nfs");
-	strncpy (vl.plugin_instance, plugin_instance,
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "nfs", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance,
 		       	sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "nfs_procedure", sizeof (vl.type));
 
 	for (i = 0; i < len; i++)
 	{
-		values[0].counter = val[i];
-		strncpy (vl.type_instance, names[i],
+		values[0].derive = val[i];
+		sstrncpy (vl.type_instance, names[i],
 				sizeof (vl.type_instance));
 		DEBUG ("%s-%s/nfs_procedure-%s = %llu",
 				vl.plugin, vl.plugin_instance,
 				vl.type_instance, val[i]);
-		plugin_dispatch_values ("nfs_procedure", &vl);
+		plugin_dispatch_values (&vl);
 	}
 } /* void nfs_procedures_submit */
 
@@ -240,9 +240,8 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
 				continue;
 			}
 
-			snprintf (plugin_instance, sizeof (plugin_instance),
+			ssnprintf (plugin_instance, sizeof (plugin_instance),
 					"v2%s", inst);
-			plugin_instance[DATA_MAX_NAME_LEN - 1] = '\0';
 
 			values = (unsigned long long *) malloc (nfs2_procedures_names_num * sizeof (unsigned long long));
 			if (values == NULL)
@@ -277,9 +276,8 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
 				continue;
 			}
 
-			snprintf (plugin_instance, sizeof (plugin_instance),
+			ssnprintf (plugin_instance, sizeof (plugin_instance),
 					"v3%s", inst);
-			plugin_instance[DATA_MAX_NAME_LEN - 1] = '\0';
 
 			values = (unsigned long long *) malloc (nfs3_procedures_names_num * sizeof (unsigned long long));
 			if (values == NULL)