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 typo
[collectd.git]
/
src
/
gmond.c
diff --git
a/src/gmond.c
b/src/gmond.c
index
2bca05a
..
b14dee3
100644
(file)
--- a/
src/gmond.c
+++ b/
src/gmond.c
@@
-26,9
+26,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
#if HAVE_NETDB_H
#include <netdb.h>
#if HAVE_NETDB_H
#include <netdb.h>
@@
-252,10
+252,8
@@
static int create_sockets(socket_entry_t **ret_sockets, /* {{{ */
sockets_num++;
break;
} else {
sockets_num++;
break;
} else {
- int yes = 1;
-
status = setsockopt(sockets[sockets_num].fd, SOL_SOCKET, SO_REUSEADDR,
status = setsockopt(sockets[sockets_num].fd, SOL_SOCKET, SO_REUSEADDR,
-
(void *)&yes, sizeof(yes
));
+
&(int){1}, sizeof(int
));
if (status != 0) {
WARNING("gmond plugin: setsockopt(2) failed: %s", STRERRNO);
}
if (status != 0) {
WARNING("gmond plugin: setsockopt(2) failed: %s", STRERRNO);
}
@@
-415,7
+413,7
@@
static staging_entry_t *staging_entry_get(const char *host, /* {{{ */
sstrncpy(se->key, key, sizeof(se->key));
se->flags = 0;
sstrncpy(se->key, key, sizeof(se->key));
se->flags = 0;
- se->vl.values =
(value_t *)
calloc(values_len, sizeof(*se->vl.values));
+ se->vl.values = calloc(values_len, sizeof(*se->vl.values));
if (se->vl.values == NULL) {
sfree(se);
return NULL;
if (se->vl.values == NULL) {
sfree(se);
return NULL;
@@
-745,8
+743,8
@@
static void *mc_receive_thread(void *arg) /* {{{ */
return (void *)-1;
}
return (void *)-1;
}
- mc_receive_sockets =
(struct pollfd *)calloc(mc_receive_sockets_num,
-
sizeof(*mc_receive_sockets));
+ mc_receive_sockets =
+
calloc(mc_receive_sockets_num,
sizeof(*mc_receive_sockets));
if (mc_receive_sockets == NULL) {
ERROR("gmond plugin: calloc failed.");
for (size_t i = 0; i < mc_receive_sockets_num; i++)
if (mc_receive_sockets == NULL) {
ERROR("gmond plugin: calloc failed.");
for (size_t i = 0; i < mc_receive_sockets_num; i++)