projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command parser: Add a vector-based interface.
[collectd.git]
/
src
/
ipmi.c
diff --git
a/src/ipmi.c
b/src/ipmi.c
index
1422077
..
a42b787
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"
@@
-114,7
+115,6
@@
static void sensor_read_handler (ipmi_sensor_t *sensor,
ipmi_states_t __attribute__((unused)) *states,
void *user_data)
{
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;
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;
}
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));
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)
{
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)
{
@@
-547,7
+543,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;
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;
ipmi_con_t *smi_connection = NULL;
ipmi_domain_id_t domain_id;
int status;