author | Florian Forster <octo@collectd.org> | |
Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100) |
1 | 2 | |||
---|---|---|---|---|
src/collectd-tg.c | patch | | diff1 | | diff2 | | blob | history |
src/email.c | patch | | diff1 | | diff2 | | blob | history |
src/ping.c | patch | | diff1 | | diff2 | | blob | history |
src/postgresql.c | patch | | diff1 | | diff2 | | blob | history |
src/python.c | patch | | diff1 | | diff2 | | blob | history |
src/rrdtool.c | patch | | diff1 | | diff2 | | blob | history |
src/tail.c | patch | | diff1 | | diff2 | | blob | history |
src/utils_format_json.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd-tg.c
Simple merge
diff --cc src/email.c
Simple merge
diff --cc src/ping.c
Simple merge
diff --cc src/postgresql.c
Simple merge
diff --cc src/python.c
index 210d785c847d9d5b6e5577efdca0001163ffd9c7,c7a82c49ee6aa7a3abb2c8ed729d90b736d5110f..1897b6d8e2d8b3286e9e1fc3066037734fea41cd
--- 1/src/python.c
--- 2/src/python.c
+++ b/src/python.c
c->callback = callback;
c->data = data;
c->next = NULL;
- user_data = malloc(sizeof(*user_data));
- user_data->free_func = cpy_destroy_user_data;
- user_data->data = c;
- plugin_register_complex_read(/* group = */ NULL, buf,
- cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), user_data);
+
+ memset (&user_data, 0, sizeof (user_data));
+ user_data.free_func = cpy_destroy_user_data;
+ user_data.data = c;
+
- ts.tv_sec = interval;
- ts.tv_nsec = (interval - ts.tv_sec) * 1000000000;
+ plugin_register_complex_read(/* group = */ "python", buf,
- cpy_read_callback, &ts, &user_data);
-
++ cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), &user_data);
return cpy_string_to_unicode_or_bytes(buf);
}
diff --cc src/rrdtool.c
Simple merge
diff --cc src/tail.c
Simple merge
diff --cc src/utils_format_json.c
Simple merge