X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpufreq.c;h=1e9e857980c68c3ebcb19af9e9b8c15d3f83ddcc;hb=2631588b043e7c2ca1a6b41e625261ebcc1465c7;hp=b1037c38bc25abbe8702059bfba8a1dc3177c998;hpb=58ecdb7ff9a4d90e87daecca05b9cb4a43070fd7;p=collectd.git

diff --git a/src/cpufreq.c b/src/cpufreq.c
index b1037c38..1e9e8579 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -37,10 +38,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,30 +68,29 @@ 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)
 {
         int status;
 	unsigned long long val;
-	int i = 0;
 	FILE *fp;
 	char filename[256];
 	char buffer[16];
 
-	for (i = 0; i < num_cpu; i++)
+	for (int 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)