projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1455 from rubenk/configure-ac-remove-dead-code
[collectd.git]
/
src
/
mic.c
diff --git
a/src/mic.c
b/src/mic.c
index
49ff0db
..
570da51
100644
(file)
--- a/
src/mic.c
+++ b/
src/mic.c
@@
-53,8
+53,8
@@
static const char *config_keys[] =
"Temperature",
"IgnoreSelectedTemperature",
"ShowPower",
"Temperature",
"IgnoreSelectedTemperature",
"ShowPower",
- "Power
Sensor
",
- "Ignore
PowerSelected
"
+ "Power",
+ "Ignore
SelectedPower
"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
@@
-131,11
+131,11
@@
static int mic_config (const char *key, const char *value) {
invert = 0;
ignorelist_set_invert(temp_ignore,invert);
}
invert = 0;
ignorelist_set_invert(temp_ignore,invert);
}
- else if (strcasecmp("Power
Sensor
",key) == 0)
+ else if (strcasecmp("Power",key) == 0)
{
ignorelist_add(power_ignore,value);
}
{
ignorelist_add(power_ignore,value);
}
- else if (strcasecmp("Ignore
PowerSelected
",key) == 0)
+ else if (strcasecmp("Ignore
SelectedPower
",key) == 0)
{
int invert = 1;
if (IS_TRUE(value))
{
int invert = 1;
if (IS_TRUE(value))
@@
-398,7
+398,9
@@
static int mic_read (void)
static int mic_shutdown (void)
{
if (mic_handle)
static int mic_shutdown (void)
{
if (mic_handle)
- MicCloseAPI(&mic_handle);
+ MicCloseAPI(&mic_handle);
+ mic_handle = NULL;
+
return (0);
}
return (0);
}