X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fipmi.c;h=a42b787fe5a40e1b67126a7eaa884371d91b026e;hb=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9;hp=a5057d36e89caafadc2ca00582cec68e33098c23;hpb=ab98fe13d7d630be88431b5ec0d761573044ac3a;p=collectd.git diff --git a/src/ipmi.c b/src/ipmi.c index a5057d36..a42b787f 100644 --- a/src/ipmi.c +++ b/src/ipmi.c @@ -24,6 +24,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "utils_ignorelist.h" @@ -114,7 +115,6 @@ static void sensor_read_handler (ipmi_sensor_t *sensor, ipmi_states_t __attribute__((unused)) *states, void *user_data) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; c_ipmi_sensor_list_t *list_item = (c_ipmi_sensor_list_t *)user_data; @@ -213,9 +213,7 @@ static void sensor_read_handler (ipmi_sensor_t *sensor, return; } - values[0].gauge = value; - - vl.values = values; + vl.values = &(value_t) { .gauge = value }; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); @@ -431,11 +429,9 @@ static int sensor_list_remove (ipmi_sensor_t *sensor) static int sensor_list_read_all (void) { - c_ipmi_sensor_list_t *list_item; - 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) { @@ -573,7 +569,7 @@ static int thread_init (os_handler_t **ret_os_handler) ipmi_open_option_t open_option[1] = { [0] = { .option = IPMI_OPEN_OPTION_ALL, - .ival = 1 + { .ival = 1 } } };