X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpufreq.c;h=b92b1d095226c6a9deea13fa6731d5a68b213478;hb=0742dc6da5074abaf3bb27c579de12460f7db690;hp=b1037c38bc25abbe8702059bfba8a1dc3177c998;hpb=c8ec3924c92ad3ca15229e8e923eaece64221337;p=collectd.git

diff --git a/src/cpufreq.c b/src/cpufreq.c
index b1037c38..b92b1d09 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -37,10 +37,10 @@ static int cpufreq_init (void)
 
 	while (1)
 	{
-		status = snprintf (filename, sizeof (filename),
+		status = ssnprintf (filename, sizeof (filename),
 				"/sys/devices/system/cpu/cpu%d/cpufreq/"
 				"scaling_cur_freq", num_cpu);
-    		if (status < 1 || status >= sizeof (filename))
+		if ((status < 1) || ((unsigned int)status >= sizeof (filename)))
 			break;
 
 		if (access (filename, R_OK))
@@ -67,13 +67,13 @@ static void cpufreq_submit (int cpu_num, double value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "cpufreq");
-	snprintf (vl.type_instance, sizeof (vl.type_instance),
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "cpufreq", sizeof (vl.plugin));
+	sstrncpy (vl.type, "cpufreq", sizeof (vl.type));
+	ssnprintf (vl.type_instance, sizeof (vl.type_instance),
 			"%i", cpu_num);
 
-	plugin_dispatch_values ("cpufreq", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int cpufreq_read (void)
@@ -87,10 +87,10 @@ static int cpufreq_read (void)
 
 	for (i = 0; i < num_cpu; i++)
 	{
-		status = snprintf (filename, sizeof (filename),
+		status = ssnprintf (filename, sizeof (filename),
 				"/sys/devices/system/cpu/cpu%d/cpufreq/"
 				"scaling_cur_freq", i);
-    		if (status < 1 || status >= sizeof (filename))
+		if ((status < 1) || ((unsigned int)status >= sizeof (filename)))
 			return (-1);
 
 		if ((fp = fopen (filename, "r")) == NULL)