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 #1842 from rubenk/declare-loop-variable-in-for-loop-controlling...
[collectd.git]
/
src
/
ipmi.c
diff --git
a/src/ipmi.c
b/src/ipmi.c
index
2fee9f2
..
ad62299
100644
(file)
--- a/
src/ipmi.c
+++ b/
src/ipmi.c
@@
-24,6
+24,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "utils_ignorelist.h"
#include "common.h"
#include "plugin.h"
#include "utils_ignorelist.h"
@@
-431,11
+432,9
@@
static int sensor_list_remove (ipmi_sensor_t *sensor)
static int sensor_list_read_all (void)
{
static int sensor_list_read_all (void)
{
- c_ipmi_sensor_list_t *list_item;
-
pthread_mutex_lock (&sensor_list_lock);
pthread_mutex_lock (&sensor_list_lock);
- for (list_item = sensor_list;
+ for (
c_ipmi_sensor_list_t *
list_item = sensor_list;
list_item != NULL;
list_item = list_item->next)
{
list_item != NULL;
list_item = list_item->next)
{
@@
-570,10
+569,10
@@
static int thread_init (os_handler_t **ret_os_handler)
return (-1);
}
return (-1);
}
- ipmi_open_option_t open_option[
] = {
+ ipmi_open_option_t open_option[
1
] = {
[0] = {
.option = IPMI_OPEN_OPTION_ALL,
[0] = {
.option = IPMI_OPEN_OPTION_ALL,
- .ival = 1
+ { .ival = 1 }
}
};
}
};