projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "curl_json plugin: Be more clever building the type instance." into collectd...
[collectd.git]
/
src
/
java.c
diff --git
a/src/java.c
b/src/java.c
index
5fda742
..
a8ffd8e
100644
(file)
--- a/
src/java.c
+++ b/
src/java.c
@@
-1419,7
+1419,7
@@
static jint JNICALL cjni_api_register_read (JNIEnv *jvm_env, /* {{{ */
ud.data = (void *) cbi;
ud.free_func = cjni_callback_info_destroy;
ud.data = (void *) cbi;
ud.free_func = cjni_callback_info_destroy;
- plugin_register_complex_read (cbi->name, cjni_read,
+ plugin_register_complex_read (
/* group = */ NULL,
cbi->name, cjni_read,
/* interval = */ NULL, &ud);
(*jvm_env)->DeleteLocalRef (jvm_env, o_read);
/* interval = */ NULL, &ud);
(*jvm_env)->DeleteLocalRef (jvm_env, o_read);
@@
-2255,7
+2255,6
@@
static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */
cjni_callback_info_t *cbi;
jobject o_ocitem;
const char *name;
cjni_callback_info_t *cbi;
jobject o_ocitem;
const char *name;
- int status;
size_t i;
jclass class;
size_t i;
jclass class;
@@
-2310,7
+2309,7
@@
static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */
method = (*jvm_env)->GetMethodID (jvm_env, class,
"config", "(Lorg/collectd/api/OConfigItem;)I");
method = (*jvm_env)->GetMethodID (jvm_env, class,
"config", "(Lorg/collectd/api/OConfigItem;)I");
-
status =
(*jvm_env)->CallIntMethod (jvm_env,
+ (*jvm_env)->CallIntMethod (jvm_env,
cbi->object, method, o_ocitem);
(*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem);
cbi->object, method, o_ocitem);
(*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem);
@@
-3067,9
+3066,8
@@
static int cjni_init (void) /* {{{ */
if (config_block != NULL)
{
if (config_block != NULL)
{
- int status;
-
status =
cjni_config_perform (config_block);
+ cjni_config_perform (config_block);
oconfig_free (config_block);
config_block = NULL;
}
oconfig_free (config_block);
config_block = NULL;
}