X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Firq.c;h=401cc6f9cb3f13e84e1a5e2fd961238565c6632c;hb=105c64c6f20807fa105b6aa350cc79c0d3a38488;hp=93c6076ba0429396131650a90766f2f075938142;hpb=b42974a9e2d83e70c166cd572725a8d72bd2a1c4;p=collectd.git

diff --git a/src/irq.c b/src/irq.c
index 93c6076b..401cc6f9 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -85,9 +85,7 @@ static int irq_config (const char *key, const char *value)
 	}
 	else if (strcasecmp (key, "IgnoreSelected") == 0)
 	{
-		if ((strcasecmp (value, "True") == 0)
-				|| (strcasecmp (value, "Yes") == 0)
-				|| (strcasecmp (value, "On") == 0))
+		if (IS_TRUE (value))
 			irq_list_action = 1;
 		else
 			irq_list_action = 0;
@@ -131,16 +129,16 @@ static void irq_submit (unsigned int irq, counter_t value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "irq", sizeof (vl.plugin));
+	sstrncpy (vl.type, "irq", sizeof (vl.type));
 
-	status = snprintf (vl.type_instance, sizeof (vl.type_instance),
+	status = ssnprintf (vl.type_instance, sizeof (vl.type_instance),
 			"%u", irq);
 	if ((status < 1) || ((unsigned int)status >= sizeof (vl.type_instance)))
 		return;
 
-	plugin_dispatch_values ("irq", &vl);
+	plugin_dispatch_values (&vl);
 } /* void irq_submit */
 
 static int irq_read (void)
@@ -151,8 +149,8 @@ static int irq_read (void)
 	FILE *fh;
 	char buffer[BUFSIZE];
 	unsigned int irq;
-	unsigned int irq_value;
-	long value;
+	unsigned long long irq_value;
+	unsigned long long value;
 	char *endptr;
 	int i;
 
@@ -182,7 +180,7 @@ static int irq_read (void)
 		for (i = 1; i < fields_num; i++)
 		{
 			errno = 0;
-			value = strtol (fields[i], &endptr, 10);
+			value = strtoull (fields[i], &endptr, 10);
 
 			if ((*endptr != '\0') || (errno != 0))
 				break;
@@ -190,8 +188,10 @@ static int irq_read (void)
 			irq_value += value;
 		} /* for (i) */
 
-		irq_submit (irq, irq_value);
+		/* Force 32bit wrap-around */
+		irq_submit (irq, irq_value % 4294967296ULL);
 	}
+
 	fclose (fh);
 
 	return (0);