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
1897b6d
..
1f80849
100644
(file)
--- a/
src/python.c
+++ b/
src/python.c
@@
-390,7
+390,7
@@
static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
}
dict = PyDict_New(); /* New reference. */
if (value_list->meta) {
}
dict = PyDict_New(); /* New reference. */
if (value_list->meta) {
- int
i,
num;
+ int num;
char **table;
meta_data_t *meta = value_list->meta;
char **table;
meta_data_t *meta = value_list->meta;
@@
-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;
@@
-1050,7
+1047,7
@@
PyMODINIT_FUNC PyInit_collectd(void) {
}
#endif
}
#endif
-static int cpy_init_python() {
+static int cpy_init_python(
void
) {
PyObject *sys;
PyObject *module;
PyObject *sys;
PyObject *module;