diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-09-05 11:05:59 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-09-05 12:05:59 +0100 |
| commit | 820112852a897e77e04d5015e8718433630b1e33 (patch) | |
| tree | 87c10c159d39b1e4d311e86133275d497e9fcb61 /libjava/gnu | |
| parent | 05d52d785c4bf5c942da5a94ad172ae40635311e (diff) | |
| download | gcc-820112852a897e77e04d5015e8718433630b1e33.zip gcc-820112852a897e77e04d5015e8718433630b1e33.tar.gz gcc-820112852a897e77e04d5015e8718433630b1e33.tar.bz2 | |
natIconv.cc (read): Remove unused local.
2000-09-05 Bryce McKinlay <bryce@albatross.co.nz>
* gnu/gcj/convert/natIconv.cc (read): Remove unused local.
(write): Ditto.
* gnu/gcj/runtime/FileDeleter.java (deleteOnExitNow): Check for null
stack. Synchronize.
* java/lang/fdlibm.h: #undef __P if previously defined.
* java/lang/natSystem.cc (currentTimeMillis): Remove unused local.
* java/net/natPlainDatagramSocketImpl.cc (send): Remove unreachable
block.
(mcastGrp): Ditto.
From-SVN: r36158
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/convert/natIconv.cc | 4 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/FileDeleter.java | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index 7875e9b..fe79dc1 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -70,8 +70,6 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer, jint outpos, jint count) { #ifdef HAVE_ICONV - jint origpos = outpos; - jbyte *bytes = elements (inbuffer); jchar *out = elements (outbuffer); size_t inavail = inlength - inpos; @@ -131,8 +129,6 @@ gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer, jint inpos, jint count) { #ifdef HAVE_ICONV - jint origpos = inpos; - jchar *chars = elements (inbuffer); jbyte *out = elements (buf); diff --git a/libjava/gnu/gcj/runtime/FileDeleter.java b/libjava/gnu/gcj/runtime/FileDeleter.java index cc7aa9d..d5f99d0 100644 --- a/libjava/gnu/gcj/runtime/FileDeleter.java +++ b/libjava/gnu/gcj/runtime/FileDeleter.java @@ -23,16 +23,13 @@ public final class FileDeleter // Helper method called by java.lang.Runtime.exit() to perform // pending deletions. - public static void deleteOnExitNow () + public synchronized static void deleteOnExitNow () { - while (!deleteOnExitStack.empty ()) - ((File)(deleteOnExitStack.pop ())).delete (); + if (deleteOnExitStack != null) + while (!deleteOnExitStack.empty ()) + ((File)(deleteOnExitStack.pop ())).delete (); } // A stack of files to delete upon normal termination. private static Stack deleteOnExitStack; } - - - - |