PlainDatagramSocketImpl.java, [...]: Renamed fnum to native_fd to match classpath more.

2003-10-21  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/PlainDatagramSocketImpl.java,
	gnu/java/net/PlainSocketImpl.java,
	gnu/java/net/natPlainDatagramSocketImplPosix.cc,
	gnu/java/net/natPlainDatagramSocketImplWin32.cc,
	gnu/java/net/natPlainSocketImplPosix.cc,
	gnu/java/net/natPlainSocketImplWin32.cc:
	Renamed fnum to native_fd to match classpath more.

From-SVN: r72746
This commit is contained in:
Michael Koch 2003-10-21 12:29:43 +00:00 committed by Michael Koch
parent d23ad8c84e
commit 7c54b00335
7 changed files with 179 additions and 169 deletions

View file

@ -1,5 +1,6 @@
/* PlainSocketImpl.java -- Default socket implementation
Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -100,7 +101,7 @@ public final class PlainSocketImpl extends SocketImpl
*
* When the socket is closed this is reset to -1.
*/
int fnum = -1;
int native_fd = -1;
// This value is set/read by setOption/getOption.
int timeout = 0;
@ -129,14 +130,13 @@ public final class PlainSocketImpl extends SocketImpl
{
synchronized (this)
{
if (fnum != -1)
if (native_fd != -1)
try
{
close();
}
catch (IOException ex)
{
// ignore
}
}
super.finalize();
@ -144,7 +144,7 @@ public final class PlainSocketImpl extends SocketImpl
public int getNativeFD()
{
return fnum;
return native_fd;
}
/**