OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natIconv.cc (read): Remove unused local.

Browse Source 
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
This commit is contained in:
Bryce McKinlay 2000-09-05 11:05:59 +00:00 committed by Bryce McKinlay
parent 05d52d785c
commit 820112852a
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
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.
2000-09-04 Tom Tromey <tromey@cygnus.com>
* java/util/zip/ZipFile.java (ZipFile): Delete file when opened in

4
libjava/gnu/gcj/convert/natIconv.cc
View File

@ -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);

11
libjava/gnu/gcj/runtime/FileDeleter.java
View File

@ -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;
}

4
libjava/java/lang/fdlibm.h
View File

@ -23,6 +23,10 @@
/* CYGNUS LOCAL: Default to XOPEN_MODE. */
#define _XOPEN_MODE
#ifdef __P
#undef __P
#endif
#ifdef __STDC__
#define __P(p) p
#else

2
libjava/java/lang/natSystem.cc
View File

@ -140,8 +140,6 @@ java::lang::System::arraycopy (jobject src, jint src_offset,
jlong
java::lang::System::currentTimeMillis (void)
{
jlong r;
struct timeval tv;
_Jv_gettimeofday (&tv);
return (jlong) tv.tv_sec * 1000 + tv.tv_usec / 1000;

6
libjava/java/net/natPlainDatagramSocketImpl.cc
View File

@ -287,9 +287,6 @@ java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *p)
if (::sendto (fnum, (char *) dbytes, p->getLength(), 0, ptr, len) >= 0)
return;
error:
char* strerr = strerror (errno);
JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));
}
void
@ -420,9 +417,6 @@ java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *inetaddr,
if (::setsockopt (fnum, level, opname, ptr, len) == 0)
return;
error:
char* strerr = strerror (errno);
JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));
}
void