X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fipmi.c;h=24986b820a04fca868430a91f711bb24f5bcf45d;hb=8acc85b19e44c9bc106484b95cd352d867abdf1c;hp=1422077b3ba666afd437ad64a10b350123f39e96;hpb=6d62a1c6abfa7cf6c789623aa6ebaf3b561556f9;p=collectd.git diff --git a/src/ipmi.c b/src/ipmi.c index 1422077b..24986b82 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,12 +213,9 @@ 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)); sstrncpy (vl.plugin, "ipmi", sizeof (vl.plugin)); sstrncpy (vl.type, list_item->sensor_type, sizeof (vl.type)); sstrncpy (vl.type_instance, list_item->sensor_name, sizeof (vl.type_instance)); @@ -431,11 +428,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) { @@ -547,7 +542,6 @@ static void domain_connection_change_handler (ipmi_domain_t *domain, static int thread_init (os_handler_t **ret_os_handler) { os_handler_t *os_handler; - ipmi_open_option_t open_option[1]; ipmi_con_t *smi_connection = NULL; ipmi_domain_id_t domain_id; int status; @@ -668,7 +662,7 @@ static int c_ipmi_init (void) c_ipmi_active = 1; status = plugin_thread_create (&thread_id, /* attr = */ NULL, thread_main, - /* user data = */ NULL); + /* user data = */ NULL, "ipmi"); if (status != 0) { c_ipmi_active = 0;