From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23823 invoked by alias); 25 May 2008 03:04:07 -0000 Received: (qmail 23794 invoked by uid 367); 25 May 2008 03:04:06 -0000 Date: Sun, 25 May 2008 03:04:00 -0000 Message-ID: <20080525030406.23779.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix casts on 32-bit machine. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 68021418975e2fa86f8189b61f67f437796a9b96 X-Git-Newrev: 377ab0df202e7d02f4687a312abf76b0a16ee1e9 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00285.txt.bz2 The branch, master has been updated via 377ab0df202e7d02f4687a312abf76b0a16ee1e9 (commit) via e5ba1dfde64bb10c943523cc1c780caf312d022b (commit) via 758a72a13264a8bc6bde9930f19750bcd718ad39 (commit) via cc2fb580fe5216e9cd828e0c61ad845a400486b8 (commit) from 68021418975e2fa86f8189b61f67f437796a9b96 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 377ab0df202e7d02f4687a312abf76b0a16ee1e9 Author: Andrew Cagney Date: Sat May 24 23:03:14 2008 -0400 Fix casts on 32-bit machine. frysk-sys/lib/unwind/ChangeLog 2008-05-24 Andrew Cagney * cni/UnwindH.hxx: Fix 32-bit type casts. commit e5ba1dfde64bb10c943523cc1c780caf312d022b Author: Andrew Cagney Date: Sat May 24 22:00:50 2008 -0400 Qualify all JNI names. frysk-sys/jnixx/ChangeLog 2008-05-24 Andrew Cagney * jnixx.hxx: Fully qualify all JNI types. commit 758a72a13264a8bc6bde9930f19750bcd718ad39 Author: Andrew Cagney Date: Sat May 24 21:30:08 2008 -0400 Rename jnixx::byteArray to jnixx::jbyteArray to be consistent with JNI. frysk-sys/frysk/sys/ChangeLog 2008-05-24 Andrew Cagney * jni/FileDescriptor.cxx: Update; byteArray -> jbyteArray. * jni/StatelessFile.cxx: Ditto. frysk-sys/frysk/sys/proc/ChangeLog 2008-05-24 Andrew Cagney * jni/AuxvBuilder.cxx: Update; byteArray -> jbyteArray. * jni/Status.cxx: Ditto. * jni/Stat.cxx: Ditto. * jni/CmdLineBuilder.cxx: Ditto. * jni/MapsBuilder.cxx: Ditto. frysk-sys/frysk/sys/ptrace/ChangeLog 2008-05-24 Andrew Cagney * jni/AddressSpace.cxx: Update; byteArray -> jbyteArray. * jni/RegisterSet.cxx: Ditto. frysk-sys/frysk/testbed/ChangeLog 2008-05-24 Andrew Cagney * jni/LocalMemory.cxx: Update; byteArray -> jbyteArray. frysk-sys/jnixx/ChangeLog 2008-05-24 Andrew Cagney * Printer.java: Generate jnixx::jbyteArray, instead of jnixx::byteArray; et.al. * PrintNamespaces.java: Ditto. * JniBindings.java: Ditto. * elements.hxx: Update. * bounds.hxx: Update. * jni/Native.cxx: Update. commit cc2fb580fe5216e9cd828e0c61ad845a400486b8 Author: Andrew Cagney Date: Sat May 24 12:10:32 2008 -0400 Eliminate uses of RawData. frysk-sys/lib/dwfl/ChangeLog 2008-05-24 Andrew Cagney * Elf.java: Replace RawData with long. * Dwarf.java: Ditto. * Dwfl.java: Ditto. * cni/Dwarf.cxx: Update. * cni/Elf.cxx: Update. * cni/Dwfl.cxx: Update. * cni/DwflModule.cxx: Update. ----------------------------------------------------------------------- Summary of changes: frysk-sys/frysk/sys/ChangeLog | 3 + frysk-sys/frysk/sys/jni/FileDescriptor.cxx | 4 +- frysk-sys/frysk/sys/jni/StatelessFile.cxx | 4 +- frysk-sys/frysk/sys/proc/ChangeLog | 8 + frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx | 2 +- frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx | 2 +- frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx | 4 +- frysk-sys/frysk/sys/proc/jni/Stat.cxx | 2 +- frysk-sys/frysk/sys/proc/jni/Status.cxx | 2 +- frysk-sys/frysk/sys/ptrace/ChangeLog | 5 + frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx | 2 +- frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx | 2 +- frysk-sys/frysk/testbed/ChangeLog | 4 + frysk-sys/frysk/testbed/jni/LocalMemory.cxx | 12 +- frysk-sys/jnixx/ChangeLog | 12 + frysk-sys/jnixx/JniBindings.java | 25 +- frysk-sys/jnixx/PrintNamespaces.java | 2 +- frysk-sys/jnixx/Printer.java | 7 +- frysk-sys/jnixx/bounds.hxx | 4 +- frysk-sys/jnixx/elements.hxx | 4 +- frysk-sys/jnixx/jni/Native.cxx | 2 +- frysk-sys/jnixx/jnixx.hxx | 722 +++++++++++----------- frysk-sys/lib/dwfl/ChangeLog | 10 + frysk-sys/lib/dwfl/Dwarf.java | 6 +- frysk-sys/lib/dwfl/Dwfl.java | 13 +- frysk-sys/lib/dwfl/Elf.java | 50 +- frysk-sys/lib/dwfl/cni/Dwarf.cxx | 48 +- frysk-sys/lib/dwfl/cni/Dwfl.cxx | 74 ++-- frysk-sys/lib/dwfl/cni/DwflModule.cxx | 4 +- frysk-sys/lib/dwfl/cni/Elf.cxx | 9 +- frysk-sys/lib/unwind/ChangeLog | 2 + frysk-sys/lib/unwind/cni/UnwindH.hxx | 4 +- 32 files changed, 551 insertions(+), 503 deletions(-) First 500 lines of diff: diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog index 72edd33..c6c850e 100644 --- a/frysk-sys/frysk/sys/ChangeLog +++ b/frysk-sys/frysk/sys/ChangeLog @@ -1,5 +1,8 @@ 2008-05-24 Andrew Cagney + * jni/FileDescriptor.cxx: Update; byteArray -> jbyteArray. + * jni/StatelessFile.cxx: Ditto. + * jni/Poll.cxx: Implement. * Poll.java: Replace RawDataManaged with long. diff --git a/frysk-sys/frysk/sys/jni/FileDescriptor.cxx b/frysk-sys/frysk/sys/jni/FileDescriptor.cxx index 80a52e6..4340d36 100644 --- a/frysk-sys/frysk/sys/jni/FileDescriptor.cxx +++ b/frysk-sys/frysk/sys/jni/FileDescriptor.cxx @@ -80,7 +80,7 @@ FileDescriptor::write(jnixx::env env, jint fd, jint b) { jint FileDescriptor::write(jnixx::env env, jint fd, - jnixx::byteArray bytes, + jnixx::jbyteArray bytes, jint off, jint len) { verifyBounds(env, bytes, off, len); @@ -149,7 +149,7 @@ FileDescriptor::read(jnixx::env env, jint fd) { jint FileDescriptor::read(jnixx::env env, jint fd, - jnixx::byteArray bytes, + jnixx::jbyteArray bytes, jint off, jint len) { verifyBounds(env, bytes, off, len); ArrayBytes b = ArrayBytes(env, bytes); diff --git a/frysk-sys/frysk/sys/jni/StatelessFile.cxx b/frysk-sys/frysk/sys/jni/StatelessFile.cxx index 6f49760..489c4b4 100644 --- a/frysk-sys/frysk/sys/jni/StatelessFile.cxx +++ b/frysk-sys/frysk/sys/jni/StatelessFile.cxx @@ -54,7 +54,7 @@ using namespace java::lang; jint frysk::sys::StatelessFile::pread(jnixx::env env, jlong fileOffset, - jnixx::byteArray bytes, + jnixx::jbyteArray bytes, jint start, jint length) { verifyBounds(env, bytes, start, length); @@ -82,7 +82,7 @@ frysk::sys::StatelessFile::pread(jnixx::env env, jlong fileOffset, jint frysk::sys::StatelessFile::pwrite(jnixx::env env, jlong fileOffset, - jnixx::byteArray bytes, + jnixx::jbyteArray bytes, jint start, jint length) { verifyBounds (env, bytes, start, length); diff --git a/frysk-sys/frysk/sys/proc/ChangeLog b/frysk-sys/frysk/sys/proc/ChangeLog index fd90b11..b6047f9 100644 --- a/frysk-sys/frysk/sys/proc/ChangeLog +++ b/frysk-sys/frysk/sys/proc/ChangeLog @@ -1,3 +1,11 @@ +2008-05-24 Andrew Cagney + + * jni/AuxvBuilder.cxx: Update; byteArray -> jbyteArray. + * jni/Status.cxx: Ditto. + * jni/Stat.cxx: Ditto. + * jni/CmdLineBuilder.cxx: Ditto. + * jni/MapsBuilder.cxx: Ditto. + 2008-05-21 Andrew Cagney * jni/AuxvBuilder.cxx (verify): Use length() and elements(). diff --git a/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx index a0fc849..b90a1ba 100644 --- a/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx +++ b/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx @@ -192,7 +192,7 @@ AuxvBuilder::construct(jnixx::env env, jint pid) { } bool -AuxvBuilder::construct(jnixx::env env, jnixx::byteArray buf) { +AuxvBuilder::construct(jnixx::env env, jnixx::jbyteArray buf) { ArrayBytes bytes = ArrayBytes(env, buf); bool ok = ::construct(env, *this, bytes); bytes.release(); diff --git a/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx index fc150ed..98cec61 100644 --- a/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx +++ b/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx @@ -84,7 +84,7 @@ frysk::sys::proc::CmdLineBuilder::construct(jnixx::env env, jint pid) { bool frysk::sys::proc::CmdLineBuilder::construct(jnixx::env env, - jnixx::byteArray buf) { + jnixx::jbyteArray buf) { ArrayBytes bytes = ArrayBytes(env, buf); bool ok = ::construct(env, this, bytes); bytes.release(); diff --git a/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx index 4c543da..b8d00d3 100644 --- a/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx +++ b/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx @@ -101,7 +101,7 @@ construct(jnixx::env env, frysk::sys::proc::MapsBuilder* builder, Bytes& buf) { } bool -frysk::sys::proc::MapsBuilder::construct(jnixx::env env, jnixx::byteArray buf) { +frysk::sys::proc::MapsBuilder::construct(jnixx::env env, jnixx::jbyteArray buf) { ArrayBytes bytes = ArrayBytes(env, buf); bool ok = ::construct(env, this, bytes); bytes.release(); @@ -114,7 +114,7 @@ frysk::sys::proc::MapsBuilder::construct(jnixx::env env, jint pid) { if (bytes.elements() == NULL) return false; { - jnixx::byteArray array = jnixx::byteArray::NewByteArray(env, bytes.length()); + jnixx::jbyteArray array = jnixx::jbyteArray::NewByteArray(env, bytes.length()); ArrayBytes b = ArrayBytes(env, array); memcpy(b.elements(), bytes.elements(), bytes.length()); b.release(); diff --git a/frysk-sys/frysk/sys/proc/jni/Stat.cxx b/frysk-sys/frysk/sys/proc/jni/Stat.cxx index e14e2f7..f7e675f 100644 --- a/frysk-sys/frysk/sys/proc/jni/Stat.cxx +++ b/frysk-sys/frysk/sys/proc/jni/Stat.cxx @@ -139,7 +139,7 @@ frysk::sys::proc::Stat::scan(jnixx::env env, jint procPid) { } frysk::sys::proc::Stat -frysk::sys::proc::Stat::scan(jnixx::env env, jnixx::byteArray buf) { +frysk::sys::proc::Stat::scan(jnixx::env env, jnixx::jbyteArray buf) { ArrayBytes bytes = ArrayBytes(env, buf); ::scan(env, (const char*) bytes.elements(), *this, GetFine(env)); bytes.release(); diff --git a/frysk-sys/frysk/sys/proc/jni/Status.cxx b/frysk-sys/frysk/sys/proc/jni/Status.cxx index fe094d9..4bb296f 100644 --- a/frysk-sys/frysk/sys/proc/jni/Status.cxx +++ b/frysk-sys/frysk/sys/proc/jni/Status.cxx @@ -123,7 +123,7 @@ Status::scan(jnixx::env env, jint pid) { } Status -Status::scan(jnixx::env env, jnixx::byteArray buf) { +Status::scan(jnixx::env env, jnixx::jbyteArray buf) { ArrayBytes bytes = ArrayBytes(env, buf); Status s = ::scan(env, (const char*)bytes.elements(), *this, GetFine(env)); bytes.release(); diff --git a/frysk-sys/frysk/sys/ptrace/ChangeLog b/frysk-sys/frysk/sys/ptrace/ChangeLog index ada8342..0121fe7 100644 --- a/frysk-sys/frysk/sys/ptrace/ChangeLog +++ b/frysk-sys/frysk/sys/ptrace/ChangeLog @@ -1,3 +1,8 @@ +2008-05-24 Andrew Cagney + + * jni/AddressSpace.cxx: Update; byteArray -> jbyteArray. + * jni/RegisterSet.cxx: Ditto. + 2008-05-22 Andrew Cagney * TestPtrace.java: Replace DaemonFactory with ForkFactory. diff --git a/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx b/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx index a74c716..0d3c666 100644 --- a/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx +++ b/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx @@ -107,7 +107,7 @@ frysk::sys::ptrace::AddressSpace::poke(::jnixx::env env, jint pid, jlong addr, j void frysk::sys::ptrace::AddressSpace::transfer(::jnixx::env env, jint op, jint pid, jlong addr, - ::jnixx::byteArray byteArray, + ::jnixx::jbyteArray byteArray, jint offset, jint length) { const int ptPeek = GetPtPeek(env); const int ptPoke = GetPtPoke(env); diff --git a/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx b/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx index 6d09673..e22ab3c 100644 --- a/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx +++ b/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx @@ -52,7 +52,7 @@ void frysk::sys::ptrace::RegisterSet::transfer(::jnixx::env env, jint op, jint pid, - ::jnixx::byteArray data, + ::jnixx::jbyteArray data, jint length) { verifyBounds(env, data, length); ArrayBytes bytes = ArrayBytes(env, data); diff --git a/frysk-sys/frysk/testbed/ChangeLog b/frysk-sys/frysk/testbed/ChangeLog index 3ac4e87..1cf45e6 100644 --- a/frysk-sys/frysk/testbed/ChangeLog +++ b/frysk-sys/frysk/testbed/ChangeLog @@ -1,3 +1,7 @@ +2008-05-24 Andrew Cagney + + * jni/LocalMemory.cxx: Update; byteArray -> jbyteArray. + 2008-05-22 Andrew Cagney * TestForkFactory.java: New. diff --git a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx index 4512ca3..f3d9e02 100644 --- a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx +++ b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2005, 2006, 2007 Red Hat Inc. +// Copyright 2005, 2006, 2007, 2008 Red Hat Inc. // // FRYSK is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by @@ -46,9 +46,9 @@ using namespace java::lang; -static ::jnixx::byteArray +static ::jnixx::jbyteArray getBytes(::jnixx::env env, void *addr, size_t length) { - ::jnixx::byteArray bytes = ::jnixx::byteArray::NewByteArray(env, length); + ::jnixx::jbyteArray bytes = ::jnixx::jbyteArray::NewByteArray(env, length); bytes.SetByteArrayRegion(env, 0, length, (jbyte*) addr); return bytes; } @@ -65,7 +65,7 @@ frysk::testbed::LocalMemory::getDataAddr(::jnixx::env) { return (jlong) &memory; } -::jnixx::byteArray +::jnixx::jbyteArray frysk::testbed::LocalMemory::getDataBytes(::jnixx::env env) { return getBytes(env, &memory, sizeof(memory)); } @@ -99,7 +99,7 @@ frysk::testbed::LocalMemory::getCodeAddr(::jnixx::env) { return (jlong)codeAddr(); } -::jnixx::byteArray +::jnixx::jbyteArray frysk::testbed::LocalMemory::getCodeBytes(::jnixx::env env) { return getBytes(env, codeAddr(), sizeof(memory)); } @@ -110,6 +110,6 @@ frysk::testbed::LocalMemory::constructStack(::jnixx::env env, // Copy known data onto the stack. uint8_t addr[sizeof(memory)]; memcpy(addr, &memory, sizeof(memory)); - ::jnixx::byteArray bytes = getBytes(env, addr, sizeof(memory)); + ::jnixx::jbyteArray bytes = getBytes(env, addr, sizeof(memory)); builder.stack(env, (jlong)addr, bytes); } diff --git a/frysk-sys/jnixx/ChangeLog b/frysk-sys/jnixx/ChangeLog index a214ae7..f4ccd89 100644 --- a/frysk-sys/jnixx/ChangeLog +++ b/frysk-sys/jnixx/ChangeLog @@ -1,3 +1,15 @@ +2008-05-24 Andrew Cagney + + * jnixx.hxx: Fully qualify all JNI types. + + * Printer.java: Generate jnixx::jbyteArray, instead of + jnixx::byteArray; et.al. + * PrintNamespaces.java: Ditto. + * JniBindings.java: Ditto. + * elements.hxx: Update. + * bounds.hxx: Update. + * jni/Native.cxx: Update. + 2008-05-22 Andrew Cagney * exceptions.cxx (errnoException): Pass up error, not errno. diff --git a/frysk-sys/jnixx/JniBindings.java b/frysk-sys/jnixx/JniBindings.java index c3c5118..3d15f36 100644 --- a/frysk-sys/jnixx/JniBindings.java +++ b/frysk-sys/jnixx/JniBindings.java @@ -377,9 +377,10 @@ class JniBindings { double[].class, }; for (int i = 0; i < types.length; i++) { - String type = types[i].getComponentType().getName(); - String Type = (Character.toUpperCase(type.charAt(0)) - + type.substring(1)); + String name = types[i].getComponentType().getName(); + String type = "j" + name; + String Type = (Character.toUpperCase(name.charAt(0)) + + name.substring(1)); bindings .put(types[i], Binding.DYNAMIC, "jsize", "GetArrayLength", @@ -388,7 +389,7 @@ class JniBindings { }, null, new Object[] { - "return env.GetArrayLength((j" + type + "Array) _object);" + "return env.GetArrayLength((::" + type + "Array) _object);" }) .put(types[i], Binding.STATIC, "::jnixx::" + type + "Array", "New" + Type + "Array", @@ -401,25 +402,25 @@ class JniBindings { "return " + type + "Array(env, env.New" + Type + "Array(length));", }) .put(types[i], Binding.DYNAMIC, - "j" + type + "*", "Get" + Type + "ArrayElements", + type + "*", "Get" + Type + "ArrayElements", new String[] { "::jnixx::env", "env", "jboolean*", "isCopy", }, null, new Object[] { - "return env.Get" + Type + "ArrayElements((j" + type + "Array) _object, isCopy);" + "return env.Get" + Type + "ArrayElements((::" + type + "Array) _object, isCopy);" }) .put(types[i], Binding.DYNAMIC, null, "Release" + Type +"ArrayElements", new String[] { "::jnixx::env", "env", - "j" + type + "*", "elements", + type + "*", "elements", "jint", "mode" }, null, new Object[] { - "env.Release" + Type + "ArrayElements((j" + type + "Array)_object, elements, mode);", + "env.Release" + Type + "ArrayElements((::" + type + "Array)_object, elements, mode);", }) .put(types[i], Binding.DYNAMIC, "void", "Get" + Type + "ArrayRegion", @@ -427,11 +428,11 @@ class JniBindings { "::jnixx::env", "env", "jsize", "start", "jsize", "length", - "j" + type + "*", "buf", + type + "*", "buf", }, null, new Object[] { - "env.Get" + Type + "ArrayRegion((j" + type + "Array) _object, start, length, buf);" + "env.Get" + Type + "ArrayRegion((::" + type + "Array) _object, start, length, buf);" }) .put(types[i], Binding.DYNAMIC, "void", "Set" + Type + "ArrayRegion", @@ -439,11 +440,11 @@ class JniBindings { "::jnixx::env", "env", "jsize", "start", "jsize", "length", - "j" + type + "*", "buf", + type + "*", "buf", }, null, new Object[] { - "env.Set" + Type + "ArrayRegion((j" + type + "Array) _object, start, length, buf);" + "env.Set" + Type + "ArrayRegion((::" + type + "Array) _object, start, length, buf);" }) ; } diff --git a/frysk-sys/jnixx/PrintNamespaces.java b/frysk-sys/jnixx/PrintNamespaces.java index a6b80a7..7208fcd 100644 --- a/frysk-sys/jnixx/PrintNamespaces.java +++ b/frysk-sys/jnixx/PrintNamespaces.java @@ -78,7 +78,7 @@ class PrintNamespaces extends ClassWalker { if (component.isPrimitive()) { printNamespace(new String[] { "jnixx", - component.getName() + "Array", + "j" + component.getName() + "Array", }); } } diff --git a/frysk-sys/jnixx/Printer.java b/frysk-sys/jnixx/Printer.java index d604338..1affa50 100644 --- a/frysk-sys/jnixx/Printer.java +++ b/frysk-sys/jnixx/Printer.java @@ -176,7 +176,7 @@ class Printer { if (global) { print("::"); } - print("jnixx::"); + print("jnixx::j"); print(componentType.getName()); print("Array"); } else { @@ -216,12 +216,15 @@ class Printer { /** * Print the class's unqualified C++ name; that is just the class - * name. + * name; used within a class to print the classes name. */ void printUnqualifiedCxxName(Class klass) { if (klass.isArray()) { printUnqualifiedCxxName(klass.getComponentType()); print("Array"); + } else if (klass.isPrimitive()) { + print("j"); + print(klass.getName()); } else { String name = klass.getName(); int dot = name.lastIndexOf('.'); diff --git a/frysk-sys/jnixx/bounds.hxx b/frysk-sys/jnixx/bounds.hxx index 9f84d5e..f79a043 100644 --- a/frysk-sys/jnixx/bounds.hxx +++ b/frysk-sys/jnixx/bounds.hxx @@ -42,7 +42,7 @@ * access is out-of-bounds throw an exception. */ -inline void verifyBounds(::jnixx::env env, ::jnixx::byteArray data, +inline void verifyBounds(::jnixx::env env, ::jnixx::jbyteArray data, jint stop) { if (stop < 0) { ::java::lang::ArrayIndexOutOfBoundsException::New(env, stop).Throw(env); @@ -52,7 +52,7 @@ inline void verifyBounds(::jnixx::env env, ::jnixx::byteArray data, } } -inline void verifyBounds(::jnixx::env env, ::jnixx::byteArray data, +inline void verifyBounds(::jnixx::env env, ::jnixx::jbyteArray data, jint start, jint length) { if (start < 0) { ::java::lang::ArrayIndexOutOfBoundsException::New(env, start).Throw(env); diff --git a/frysk-sys/jnixx/elements.hxx b/frysk-sys/jnixx/elements.hxx index 2e0930e..5bcae8d 100644 --- a/frysk-sys/jnixx/elements.hxx +++ b/frysk-sys/jnixx/elements.hxx @@ -164,7 +164,7 @@ public: class ArrayBytes : public Bytes { private: - ::jnixx::byteArray bytes; + ::jnixx::jbyteArray bytes; public: void operator=(const ArrayBytes& src) { release(); @@ -177,7 +177,7 @@ public: ArrayBytes(const ArrayBytes& old) { this->operator=(old); } - ArrayBytes(::jnixx::env env, ::jnixx::byteArray bytes) { + ArrayBytes(::jnixx::env env, ::jnixx::jbyteArray bytes) { this->bytes = bytes; this->env = env; } diff --git a/frysk-sys/jnixx/jni/Native.cxx b/frysk-sys/jnixx/jni/Native.cxx index 0fd5f58..c207cce 100644 --- a/frysk-sys/jnixx/jni/Native.cxx +++ b/frysk-sys/jnixx/jni/Native.cxx @@ -113,7 +113,7 @@ throwCopy(jnixx::env env, int n, StringChars stringChars, void jnixx::Native::throwElements(jnixx::env env, String string, jnixx::array stringArray, - jnixx::byteArray bytes) { + jnixx::jbyteArray bytes) { StringChars stringChars = StringChars(env, string); StringArrayChars stringArrayChars = StringArrayChars(env, stringArray); ArrayBytes arrayBytes = ArrayBytes(env, bytes); diff --git a/frysk-sys/jnixx/jnixx.hxx b/frysk-sys/jnixx/jnixx.hxx index 4ac91d7..aef95bb 100644 --- a/frysk-sys/jnixx/jnixx.hxx +++ b/frysk-sys/jnixx/jnixx.hxx @@ -66,22 +66,22 @@ namespace jnixx { // Version Information - jint GetVersion() { + ::jint GetVersion() { return _jni->GetVersion(); } // Class Operations - jclass DefineClass(const char *name, jobject loader, - const jbyte *buf, jsize bufLen) { - jclass klass = _jni->DefineClass(name, loader, buf, bufLen); + ::jclass DefineClass(const char *name, ::jobject loader, + const ::jbyte *buf, ::jsize bufLen) { + ::jclass klass = _jni->DefineClass(name, loader, buf, bufLen); if (klass == NULL) { throwPendingException(); } return klass; } - jclass FindClass(const char *signature) { - jclass klass = _jni->FindClass(signature); + ::jclass FindClass(const char *signature) { + ::jclass klass = _jni->FindClass(signature); if (klass == NULL) { fprintf(stderr, "%s(\"%s\") failed\n", __func__, signature); @@ -89,24 +89,24 @@ namespace jnixx { } return klass; } - jclass GetSuperclass(jclass klass) { + ::jclass GetSuperclass(::jclass klass) { return _jni->GetSuperclass(klass); } - jboolean IsAssignableFrom(jclass klass1, jclass klass2) { + ::jboolean IsAssignableFrom(::jclass klass1, ::jclass klass2) { return _jni->IsAssignableFrom(klass1, klass2); } // Exceptions hooks/post-receive -- frysk system monitor/debugger