X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Firq.c;h=9eb1de426b83bea8b7243f0c2e9c993de87fdb1c;hb=5cc8977fa83ad48de503b0e7d4b3af39f905dce6;hp=1c7b5aec90eebfbe09d12f46a8ca3c3da29a1c31;hpb=c493010e9f1a6537dca21be2290bc28051ad0efc;p=collectd.git

diff --git a/src/irq.c b/src/irq.c
index 1c7b5aec..9eb1de42 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -25,10 +25,8 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if KERNEL_LINUX
-# define IRQ_HAVE_READ 1
-#else
-# define IRQ_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
 #define BUFSIZE 128
@@ -36,7 +34,6 @@
 /*
  * (Module-)Global variables
  */
-#if IRQ_HAVE_READ
 static const char *config_keys[] =
 {
 	"Irq",
@@ -114,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);
 
@@ -140,7 +137,7 @@ static void irq_submit (unsigned int irq, counter_t value)
 
 	status = snprintf (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);
@@ -148,8 +145,6 @@ static void irq_submit (unsigned int irq, counter_t value)
 
 static int irq_read (void)
 {
-#if KERNEL_LINUX
-
 #undef BUFSIZE
 #define BUFSIZE 256
 
@@ -198,19 +193,15 @@ static int irq_read (void)
 		irq_submit (irq, irq_value);
 	}
 	fclose (fh);
-#endif /* KERNEL_LINUX */
 
 	return (0);
 } /* int irq_read */
-#endif /* IRQ_HAVE_READ */
 
 void module_register (void)
 {
-#if IRQ_HAVE_READ
 	plugin_register_config ("irq", irq_config,
 			config_keys, config_keys_num);
 	plugin_register_read ("irq", irq_read);
-#endif /* IRQ_HAVE_READ */
 } /* void module_register */
 
 #undef BUFSIZE