bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obsolete 'NetAddr' mapping

Browse Source
This commit is contained in:
Doug MacEachern 2006-07-04 19:24:22 +00:00
parent ee37d10b2c
commit 9751e49318
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/java/src/jni/generate.pl
View File

@ -1067,10 +1067,10 @@ my %pfields = (
Int => "IV", Int => "IV",
Char => "char", Char => "char",
String => "char *", String => "char *",
NetAddr => "Sigar::NetAddr", NetAddress => "Sigar::NetAddress",
); );
$jfields{'NetAddress'} = $jfields{'NetAddr'} = $jfields{'String'}; $jfields{'NetAddress'} = $jfields{'String'};
my %jinit = ( my %jinit = (
String => 'null', String => 'null',
@ -1082,7 +1082,7 @@ my %jtype = (
#alias #alias
for my $j (\%jfields, \%jinit, \%jtype) { for my $j (\%jfields, \%jinit, \%jtype) {
$j->{'NetAddress'} = $j->{'NetAddr'} = $j->{'String'}; $j->{'NetAddress'} = $j->{'String'};
} }
my %func_alias = ( my %func_alias = (

9
bindings/java/src/jni/javasigar.c
View File

@ -300,15 +300,6 @@ JNIEXPORT void SIGAR_JNIx(kill)
#define SetStringField(env, obj, fieldID, val) \ #define SetStringField(env, obj, fieldID, val) \
SetObjectField(env, obj, fieldID, JENV->NewStringUTF(env, 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) { static jstring jnet_address_to_string(JNIEnv *env, sigar_t *sigar, sigar_net_address_t *val) {
char addr_str[INET6_ADDRSTRLEN]; char addr_str[INET6_ADDRSTRLEN];
sigar_net_address_to_string(sigar, val, addr_str); sigar_net_address_to_string(sigar, val, addr_str);