projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt plugin: fix implicit conversion warning
[collectd.git]
/
src
/
virt.c
diff --git
a/src/virt.c
b/src/virt.c
index
3785385
..
1ce376c
100644
(file)
--- a/
src/virt.c
+++ b/
src/virt.c
@@
-1016,7
+1016,7
@@
static unsigned int parse_ex_stats_flags(char **exstats, int numexstats) {
}
static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
}
static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
- if ((state < 0) || (state >= STATIC_ARRAY_SIZE(domain_states))) {
+ if ((state < 0) || (
(size_t)
state >= STATIC_ARRAY_SIZE(domain_states))) {
ERROR(PLUGIN_NAME ": Array index out of bounds: state=%d", state);
return;
}
ERROR(PLUGIN_NAME ": Array index out of bounds: state=%d", state);
return;
}
@@
-1024,7
+1024,7
@@
static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
char msg[DATA_MAX_NAME_LEN];
const char *state_str = domain_states[state];
#ifdef HAVE_DOM_REASON
char msg[DATA_MAX_NAME_LEN];
const char *state_str = domain_states[state];
#ifdef HAVE_DOM_REASON
- if ((reason < 0) || (reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
+ if ((reason < 0) || (
(size_t)
reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
ERROR(PLUGIN_NAME ": Array index out of bounds: reason=%d", reason);
return;
}
ERROR(PLUGIN_NAME ": Array index out of bounds: reason=%d", reason);
return;
}
@@
-1584,7
+1584,7
@@
static int get_block_stats(struct block_device *block_dev) {
#define NM_ADD_STR_ITEMS(_items, _size) \
do { \
#define NM_ADD_STR_ITEMS(_items, _size) \
do { \
- for (
in
t _i = 0; _i < _size; ++_i) { \
+ for (
size_
t _i = 0; _i < _size; ++_i) { \
DEBUG(PLUGIN_NAME \
" plugin: Adding notification metadata name=%s value=%s", \
_items[_i].name, _items[_i].value); \
DEBUG(PLUGIN_NAME \
" plugin: Adding notification metadata name=%s value=%s", \
_items[_i].name, _items[_i].value); \
@@
-1609,7
+1609,7
@@
static int fs_info_notify(virDomainPtr domain, virDomainFSInfoPtr fs_info) {
{.name = "name", .value = fs_info->name},
{.name = "fstype", .value = fs_info->fstype}};
{.name = "name", .value = fs_info->name},
{.name = "fstype", .value = fs_info->fstype}};
- for (
in
t i = 0; i < fs_info->ndevAlias; ++i) {
+ for (
size_
t i = 0; i < fs_info->ndevAlias; ++i) {
fs_dev_alias[i].name = "devAlias";
fs_dev_alias[i].value = fs_info->devAlias[i];
}
fs_dev_alias[i].name = "devAlias";
fs_dev_alias[i].value = fs_info->devAlias[i];
}
@@
-1898,7
+1898,9
@@
static int virt_notif_thread_init(virt_notif_thread_t *thread_data) {
* domain_event_cb_id to '-1'
*/
thread_data->domain_event_cb_id = -1;
* domain_event_cb_id to '-1'
*/
thread_data->domain_event_cb_id = -1;
- thread_data->is_active = 0;
+ pthread_mutex_lock(&thread_data->active_mutex);
+ thread_data->is_active = false;
+ pthread_mutex_unlock(&thread_data->active_mutex);
return 0;
}
return 0;
}
@@
-2646,12
+2648,12
@@
static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
static int ignore_device_match(ignorelist_t *il, const char *domname,
const char *devpath) {
char *name;
static int ignore_device_match(ignorelist_t *il, const char *domname,
const char *devpath) {
char *name;
- int
n,
r;
+ int r;
if ((domname == NULL) || (devpath == NULL))
return 0;
if ((domname == NULL) || (devpath == NULL))
return 0;
- n = strlen(domname) + strlen(devpath) + 2;
+
size_t
n = strlen(domname) + strlen(devpath) + 2;
name = malloc(n);
if (name == NULL) {
ERROR(PLUGIN_NAME " plugin: malloc failed.");
name = malloc(n);
if (name == NULL) {
ERROR(PLUGIN_NAME " plugin: malloc failed.");