X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fipmi.c;h=a42b787fe5a40e1b67126a7eaa884371d91b026e;hb=a78f607649122abb0684b191f6e8d1e44a117017;hp=2fee9f280a0c01a69770129a19046a1345d72484;hpb=fa07a9a09d75d3d5ef9ebd9e34d442d53fa35787;p=collectd.git diff --git a/src/ipmi.c b/src/ipmi.c index 2fee9f28..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) { @@ -570,10 +566,10 @@ static int thread_init (os_handler_t **ret_os_handler) return (-1); } - ipmi_open_option_t open_option[ ] = { + ipmi_open_option_t open_option[1] = { [0] = { .option = IPMI_OPEN_OPTION_ALL, - .ival = 1 + { .ival = 1 } } };