X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fjava.c;h=cd173c5890ae122dbe6db94dda4dead5699a1152;hb=7535ee83bf0b12a168cee3c70e5fb97ed6dfc96c;hp=67740ac8dae78c6da33a4d47891c9824fa04096a;hpb=b847e8ff2fd928813397466a941947c8fce66d66;p=collectd.git diff --git a/src/java.c b/src/java.c index 67740ac8..cd173c58 100644 --- a/src/java.c +++ b/src/java.c @@ -1425,13 +1425,11 @@ static jint JNICALL cjni_api_register_read (JNIEnv *jvm_env, /* {{{ */ DEBUG ("java plugin: Registering new read callback: %s", cbi->name); - user_data_t ud = { - .data = cbi, - .free_func = cjni_callback_info_destroy - }; - plugin_register_complex_read (/* group = */ NULL, cbi->name, cjni_read, - /* interval = */ 0, &ud); + /* interval = */ 0, &(user_data_t) { + .data = cbi, + .free_func = cjni_callback_info_destroy, + }); (*jvm_env)->DeleteLocalRef (jvm_env, o_read); @@ -1449,12 +1447,10 @@ static jint JNICALL cjni_api_register_write (JNIEnv *jvm_env, /* {{{ */ DEBUG ("java plugin: Registering new write callback: %s", cbi->name); - user_data_t ud = { - .data = cbi, - .free_func = cjni_callback_info_destroy - }; - - plugin_register_write (cbi->name, cjni_write, &ud); + plugin_register_write (cbi->name, cjni_write, &(user_data_t) { + .data = cbi, + .free_func = cjni_callback_info_destroy, + }); (*jvm_env)->DeleteLocalRef (jvm_env, o_write); @@ -1472,12 +1468,10 @@ static jint JNICALL cjni_api_register_flush (JNIEnv *jvm_env, /* {{{ */ DEBUG ("java plugin: Registering new flush callback: %s", cbi->name); - user_data_t ud = { - .data = cbi, - .free_func = cjni_callback_info_destroy - }; - - plugin_register_flush (cbi->name, cjni_flush, &ud); + plugin_register_flush (cbi->name, cjni_flush, &(user_data_t) { + .data = cbi, + .free_func = cjni_callback_info_destroy, + }); (*jvm_env)->DeleteLocalRef (jvm_env, o_flush); @@ -1502,12 +1496,10 @@ static jint JNICALL cjni_api_register_log (JNIEnv *jvm_env, /* {{{ */ DEBUG ("java plugin: Registering new log callback: %s", cbi->name); - user_data_t ud = { - .data = cbi, - .free_func = cjni_callback_info_destroy - }; - - plugin_register_log (cbi->name, cjni_log, &ud); + plugin_register_log (cbi->name, cjni_log, &(user_data_t) { + .data = cbi, + .free_func = cjni_callback_info_destroy, + }); (*jvm_env)->DeleteLocalRef (jvm_env, o_log); @@ -1526,12 +1518,10 @@ static jint JNICALL cjni_api_register_notification (JNIEnv *jvm_env, /* {{{ */ DEBUG ("java plugin: Registering new notification callback: %s", cbi->name); - user_data_t ud = { - .data = cbi, - .free_func = cjni_callback_info_destroy - }; - - plugin_register_notification (cbi->name, cjni_notification, &ud); + plugin_register_notification (cbi->name, cjni_notification, &(user_data_t) { + .data = cbi, + .free_func = cjni_callback_info_destroy, + }); (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);