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 #1646 from rubenk/cleanup-malloc-calls
[collectd.git]
/
src
/
python.c
diff --git
a/src/python.c
b/src/python.c
index
b909024
..
1f80849
100644
(file)
--- a/
src/python.c
+++ b/
src/python.c
@@
-552,10
+552,9
@@
static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args
Py_INCREF(callback);
Py_XINCREF(data);
Py_INCREF(callback);
Py_XINCREF(data);
- c =
malloc(
sizeof(*c));
+ c =
calloc(1,
sizeof(*c));
if (c == NULL)
return NULL;
if (c == NULL)
return NULL;
- memset (c, 0, sizeof (*c));
c->name = strdup(buf);
c->callback = callback;
c->name = strdup(buf);
c->callback = callback;
@@
-644,10
+643,9
@@
static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
Py_INCREF(callback);
Py_XINCREF(data);
Py_INCREF(callback);
Py_XINCREF(data);
- c =
malloc(
sizeof(*c));
+ c =
calloc(1,
sizeof(*c));
if (c == NULL)
return NULL;
if (c == NULL)
return NULL;
- memset (c, 0, sizeof (*c));
c->name = strdup(buf);
c->callback = callback;
c->name = strdup(buf);
c->callback = callback;
@@
-683,10
+681,9
@@
static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
Py_INCREF(callback);
Py_XINCREF(data);
Py_INCREF(callback);
Py_XINCREF(data);
- c =
malloc(
sizeof(*c));
+ c =
calloc(1,
sizeof(*c));
if (c == NULL)
return NULL;
if (c == NULL)
return NULL;
- memset (c, 0, sizeof (*c));
c->name = strdup(buf);
c->callback = callback;
c->name = strdup(buf);
c->callback = callback;