X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fjava.c;h=cf301c6bc3d6ee331849841da55a43d4d98143d5;hb=c4439c9cb3e2348ad7013644731de27a55eca478;hp=56b48df2633f155fc0a61826a25fe3a67ba188c6;hpb=a396da422740caf336a6d594515e8d80de6f440a;p=collectd.git

diff --git a/src/java.c b/src/java.c
index 56b48df2..cf301c6b 100644
--- a/src/java.c
+++ b/src/java.c
@@ -23,9 +23,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
 #include "plugin.h"
+#include "utils/common/common.h"
 
 #include <jni.h>
 
@@ -82,7 +82,7 @@ static pthread_key_t jvm_env_key;
 
 /* Configuration options for the JVM. */
 static char **jvm_argv;
-static size_t jvm_argc = 0;
+static size_t jvm_argc;
 
 /* List of class names to load */
 static java_plugin_class_t *java_classes_list;
@@ -90,7 +90,7 @@ static size_t java_classes_list_len;
 
 /* List of config, init, and shutdown callbacks. */
 static cjni_callback_info_t *java_callbacks;
-static size_t java_callbacks_num = 0;
+static size_t java_callbacks_num;
 static pthread_mutex_t java_callbacks_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static oconfig_item_t *config_block;
@@ -1009,9 +1009,8 @@ static int jtoc_values_array(JNIEnv *jvm_env, /* {{{ */
   jobjectArray o_number_array;
 
   value_t *values;
-  int values_num;
 
-  values_num = ds->ds_num;
+  size_t values_num = ds->ds_num;
 
   values = NULL;
   o_number_array = NULL;
@@ -1058,13 +1057,13 @@ static int jtoc_values_array(JNIEnv *jvm_env, /* {{{ */
     BAIL_OUT(-1);
   }
 
-  values = (value_t *)calloc(values_num, sizeof(value_t));
+  values = calloc(values_num, sizeof(*values));
   if (values == NULL) {
     ERROR("java plugin: jtoc_values_array: calloc failed.");
     BAIL_OUT(-1);
   }
 
-  for (int i = 0; i < values_num; i++) {
+  for (size_t i = 0; i < values_num; i++) {
     jobject o_number;
     int status;
 
@@ -1072,7 +1071,7 @@ static int jtoc_values_array(JNIEnv *jvm_env, /* {{{ */
         (*jvm_env)->GetObjectArrayElement(jvm_env, o_number_array, (jsize)i);
     if (o_number == NULL) {
       ERROR("java plugin: jtoc_values_array: "
-            "GetObjectArrayElement (%i) failed.",
+            "GetObjectArrayElement (%zu) failed.",
             i);
       BAIL_OUT(-1);
     }
@@ -1080,7 +1079,7 @@ static int jtoc_values_array(JNIEnv *jvm_env, /* {{{ */
     status = jtoc_value(jvm_env, values + i, ds->ds[i].type, o_number);
     if (status != 0) {
       ERROR("java plugin: jtoc_values_array: "
-            "jtoc_value (%i) failed.",
+            "jtoc_value (%zu) failed.",
             i);
       BAIL_OUT(-1);
     }