X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Firq.c;h=401cc6f9cb3f13e84e1a5e2fd961238565c6632c;hb=0d5c879672770e3b8a740727fb223a6febdeaa27;hp=986efafbb8e77a5d19debbfa0b634cbec230ffdc;hpb=3f391479bfc45d0ff6e0c7b87c899e41a192f392;p=collectd.git diff --git a/src/irq.c b/src/irq.c index 986efafb..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; @@ -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);