projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.2' into collectd-4.3
[collectd.git]
/
src
/
wireless.c
diff --git
a/src/wireless.c
b/src/wireless.c
index
1067549
..
285fb74
100644
(file)
--- a/
src/wireless.c
+++ b/
src/wireless.c
@@
-23,15
+23,12
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#if defined(KERNEL_LINUX)
-# define WIRELESS_HAVE_READ 1
-#else
-# define WIRELESS_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
#endif
#define WIRELESS_PROC_FILE "/proc/net/wireless"
#endif
#define WIRELESS_PROC_FILE "/proc/net/wireless"
-#if WIRELESS_HAVE_READ
#if 0
static double wireless_dbm_to_watt (double dbm)
{
#if 0
static double wireless_dbm_to_watt (double dbm)
{
@@
-135,8
+132,8
@@
static int wireless_read (void)
power = 1.0; /* invalid */
/* noise [dBm] < 0.0 */
power = 1.0; /* invalid */
/* noise [dBm] < 0.0 */
- noise = strtod (fields[
3
], &endptr);
- if (fields[
3
] == endptr)
+ noise = strtod (fields[
4
], &endptr);
+ if (fields[
4
] == endptr)
noise = 1.0; /* invalid */
else if ((noise >= 0.0) && (noise <= 100.0))
noise = wireless_percent_to_power (noise);
noise = 1.0; /* invalid */
else if ((noise >= 0.0) && (noise <= 100.0))
noise = wireless_percent_to_power (noise);
@@
-160,11
+157,8
@@
static int wireless_read (void)
return (0);
} /* int wireless_read */
return (0);
} /* int wireless_read */
-#endif /* WIRELESS_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
-#if WIRELESS_HAVE_READ
plugin_register_read ("wireless", wireless_read);
plugin_register_read ("wireless", wireless_read);
-#endif /* WIRELESS_HAVE_READ */
} /* void module_register */
} /* void module_register */