irq plugin: Parse interrupt counters as unsigned long long.

[collectd.git] / src / irq.c

diff --git a/src/irq.c b/src/irq.c
index b6b8c4c..38304fc 100644 (file)
--- a/src/irq.c
+++ b/src/irq.c
@@ -111,7 +111,7 @@ static int check_ignore_irq (const unsigned int irq)
        if (irq_list_num < 1)
                return (0);
 
-       for (i = 0; i < irq_list_num; i++)
+       for (i = 0; (unsigned int)i < irq_list_num; i++)
                if (irq == irq_list[i])
                        return (irq_list_action);
 
@@ -132,15 +132,16 @@ static void irq_submit (unsigned int irq, counter_t value)
        vl.values = values;
        vl.values_len = 1;
        vl.time = time (NULL);
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "irq");
+       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) || (status >= sizeof (vl.type_instance)))
+       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 +152,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 +183,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;