X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fpython.c;h=5274262bbd6b5826ca40b8ec6940a20a7ea297cb;hb=afb38f31abd27d5b4ce08023f8bbbaeeb353c55f;hp=ec2317b3721d00149e68fdc1567f59340da2cf99;hpb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;p=collectd.git diff --git a/src/python.c b/src/python.c index ec2317b3..5274262b 100644 --- a/src/python.c +++ b/src/python.c @@ -665,12 +665,11 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec c->data = data; c->next = NULL; - user_data_t user_data = { - .data = c, - .free_func = cpy_destroy_user_data - }; + register_function(buf, handler, &(user_data_t) { + .data = c, + .free_func = cpy_destroy_user_data, + }); - register_function(buf, handler, &user_data); ++cpy_num_callbacks; return cpy_string_to_unicode_or_bytes(buf); } @@ -704,13 +703,12 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd c->data = data; c->next = NULL; - user_data_t user_data = { - .data = c, - .free_func = cpy_destroy_user_data - }; - plugin_register_complex_read(/* group = */ "python", buf, - cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), &user_data); + cpy_read_callback, DOUBLE_TO_CDTIME_T (interval), + &(user_data_t) { + .data = c, + .free_func = cpy_destroy_user_data, + }); ++cpy_num_callbacks; return cpy_string_to_unicode_or_bytes(buf); }