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 #3158 from smortex/riemann-meta-data
[collectd.git]
/
src
/
ipmi.c
diff --git
a/src/ipmi.c
b/src/ipmi.c
index
2642f64
..
d78ffa9
100644
(file)
--- a/
src/ipmi.c
+++ b/
src/ipmi.c
@@
-26,9
+26,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
#include <OpenIPMI/ipmi_auth.h>
#include <OpenIPMI/ipmi_conn.h>
#include <OpenIPMI/ipmi_auth.h>
#include <OpenIPMI/ipmi_conn.h>
@@
-113,7
+113,7
@@
static void c_ipmi_error(c_ipmi_instance_t *st, const char *func, int status) {
if (errbuf[0] == 0) {
snprintf(errbuf, sizeof(errbuf), "Unknown error %#x", status);
}
if (errbuf[0] == 0) {
snprintf(errbuf, sizeof(errbuf), "Unknown error %#x", status);
}
- errbuf[sizeof(errbuf) - 1] =
0
;
+ errbuf[sizeof(errbuf) - 1] =
'\0'
;
ERROR("ipmi plugin: %s failed for `%s`: %s", func, st->name, errbuf);
} /* void c_ipmi_error */
ERROR("ipmi plugin: %s failed for `%s`: %s", func, st->name, errbuf);
} /* void c_ipmi_error */
@@
-310,7
+310,7
@@
static void sensor_get_name(ipmi_sensor_t *sensor, char *buffer, int buf_len) {
return;
ipmi_sensor_get_name(sensor, temp, sizeof(temp));
return;
ipmi_sensor_get_name(sensor, temp, sizeof(temp));
- temp[sizeof(temp) - 1] =
0
;
+ temp[sizeof(temp) - 1] =
'\0'
;
if (entity_id_string != NULL && strlen(temp))
snprintf(sensor_name, sizeof(sensor_name), "%s %s", temp, entity_id_string);
if (entity_id_string != NULL && strlen(temp))
snprintf(sensor_name, sizeof(sensor_name), "%s %s", temp, entity_id_string);
@@
-358,7
+358,7
@@
static const char *sensor_unit_to_type(ipmi_sensor_t *sensor) {
/* find the db type by using sensor base unit type */
enum ipmi_unit_type_e ipmi_type = ipmi_sensor_get_base_unit(sensor);
/* find the db type by using sensor base unit type */
enum ipmi_unit_type_e ipmi_type = ipmi_sensor_get_base_unit(sensor);
- for (
in
t i = 0; i < STATIC_ARRAY_SIZE(ipmi_db_type_map); i++)
+ for (
size_
t i = 0; i < STATIC_ARRAY_SIZE(ipmi_db_type_map); i++)
if (ipmi_db_type_map[i].type == ipmi_type)
return ipmi_db_type_map[i].type_name;
if (ipmi_db_type_map[i].type == ipmi_type)
return ipmi_db_type_map[i].type_name;
@@
-476,7
+476,7
@@
static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) {
return 0;
}
return 0;
}
- list_item =
(c_ipmi_sensor_list_t *)calloc(1, sizeof(c_ipmi_sensor_list_t
));
+ list_item =
calloc(1, sizeof(*list_item
));
if (list_item == NULL) {
pthread_mutex_unlock(&st->sensor_list_lock);
return -1;
if (list_item == NULL) {
pthread_mutex_unlock(&st->sensor_list_lock);
return -1;