projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
battery: add missing capacity type to types.db
[collectd.git]
/
src
/
ceph.c
diff --git
a/src/ceph.c
b/src/ceph.c
index
1b1f40b
..
d928a7b
100644
(file)
--- a/
src/ceph.c
+++ b/
src/ceph.c
@@
-21,6
+21,7
@@
* Dan Ryder <daryder@cisco.com>
**/
* Dan Ryder <daryder@cisco.com>
**/
+#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#include "collectd.h"
#define _BSD_SOURCE
#include "collectd.h"
@@
-656,7
+657,8
@@
static int cc_handle_bool(struct oconfig_item_s *item, int *dest)
static int cc_add_daemon_config(oconfig_item_t *ci)
{
int ret, i;
static int cc_add_daemon_config(oconfig_item_t *ci)
{
int ret, i;
- struct ceph_daemon *array, *nd, cd;
+ struct ceph_daemon *nd, cd;
+ struct ceph_daemon **tmp;
memset(&cd, 0, sizeof(struct ceph_daemon));
if((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
memset(&cd, 0, sizeof(struct ceph_daemon));
if((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
@@
-708,21
+710,21
@@
static int cc_add_daemon_config(oconfig_item_t *ci)
return -EINVAL;
}
return -EINVAL;
}
- array = realloc(g_daemons,
- sizeof(struct ceph_daemon *) * (g_num_daemons + 1));
- if(array == NULL)
+ tmp = realloc(g_daemons, (g_num_daemons+1) * sizeof(*g_daemons));
+ if(tmp == NULL)
{
/* The positive return value here indicates that this is a
* runtime error, not a configuration error. */
return ENOMEM;
}
{
/* The positive return value here indicates that this is a
* runtime error, not a configuration error. */
return ENOMEM;
}
- g_daemons = (struct ceph_daemon**) array;
- nd = malloc(sizeof(struct ceph_daemon));
+ g_daemons = tmp;
+
+ nd = malloc(sizeof(*nd));
if(!nd)
{
return ENOMEM;
}
if(!nd)
{
return ENOMEM;
}
- memcpy(nd, &cd, sizeof(
struct ceph_daemon
));
+ memcpy(nd, &cd, sizeof(
*nd
));
g_daemons[g_num_daemons++] = nd;
return 0;
}
g_daemons[g_num_daemons++] = nd;
return 0;
}