diff --git a/bindings/java/src/jni/generate.pl b/bindings/java/src/jni/generate.pl index 729b7662..b36b971e 100644 --- a/bindings/java/src/jni/generate.pl +++ b/bindings/java/src/jni/generate.pl @@ -1067,10 +1067,10 @@ my %pfields = ( Int => "IV", Char => "char", String => "char *", - NetAddr => "Sigar::NetAddr", + NetAddress => "Sigar::NetAddress", ); -$jfields{'NetAddress'} = $jfields{'NetAddr'} = $jfields{'String'}; +$jfields{'NetAddress'} = $jfields{'String'}; my %jinit = ( String => 'null', @@ -1082,7 +1082,7 @@ my %jtype = ( #alias for my $j (\%jfields, \%jinit, \%jtype) { - $j->{'NetAddress'} = $j->{'NetAddr'} = $j->{'String'}; + $j->{'NetAddress'} = $j->{'String'}; } my %func_alias = ( diff --git a/bindings/java/src/jni/javasigar.c b/bindings/java/src/jni/javasigar.c index 2624479c..fbd6e156 100644 --- a/bindings/java/src/jni/javasigar.c +++ b/bindings/java/src/jni/javasigar.c @@ -300,15 +300,6 @@ JNIEXPORT void SIGAR_JNIx(kill) #define SetStringField(env, obj, fieldID, val) \ SetObjectField(env, obj, fieldID, JENV->NewStringUTF(env, val)) -static jstring jinet_ntoa(JNIEnv *env, sigar_t *sigar, sigar_uint64_t val) { - char addr_str[SIGAR_INET_ADDR_LEN]; - sigar_inet_ntoa(sigar, val, addr_str); - return JENV->NewStringUTF(env, addr_str); -} - -#define SetNetAddrField(env, obj, fieldID, val) \ - SetObjectField(env, obj, fieldID, jinet_ntoa(env, sigar, val)) - static jstring jnet_address_to_string(JNIEnv *env, sigar_t *sigar, sigar_net_address_t *val) { char addr_str[INET6_ADDRSTRLEN]; sigar_net_address_to_string(sigar, val, addr_str);