From c7684ffe55c75b893fe40988dbb8fcea9beae3ba Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 25 May 2003 11:40:19 +0000 Subject: PushbackInputStream.java, [...]: Merged new versions from classpath. 2003-05-25 Michael Koch * java/io/PushbackInputStream.java, java/net/Authenticator.java, java/net/ContentHandler.java, java/net/ContentHandlerFactory.java, java/net/DatagramSocket.java, java/net/DatagramSocketImpl.java, java/net/DatagramSocketImplFactory.java, java/net/FileNameMap.java, java/net/SocketImplFactory.java, java/net/SocketOptions.java, java/net/URLStreamHandlerFactory.java: Merged new versions from classpath. From-SVN: r67165 --- libjava/java/net/SocketOptions.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libjava/java/net/SocketOptions.java') diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java index f62afef..b0404e8 100644 --- a/libjava/java/net/SocketOptions.java +++ b/libjava/java/net/SocketOptions.java @@ -1,5 +1,6 @@ /* SocketOptions.java -- Implements options for sockets (duh!) - Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, + 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -138,30 +139,30 @@ public interface SocketOptions * Sets the specified option on a socket to the passed in object. For * options that take an integer argument, the passed in object is an * Integer. For options that are set to on or off, the - * value passed will be a Boolean. The option_id + * value passed will be a Boolean. The optionId * parameter is one of the defined constants in this interface. * - * @param option_id The identifier of the option + * @param optionId The identifier of the option * @param val The value to set the option to * * @exception SocketException If an error occurs */ - void setOption(int option_id, Object val) throws SocketException; + void setOption(int optionId, Object val) throws SocketException; /** * Returns the current setting of the specified option. The * Object returned will be an Integer for options * that have integer values. For options that are set to on or off, a - * Boolean will be returned. The option_id - * is one of the defined constants in this interface. + * Boolean will be returned. The optionId + * parameter is one of the defined constants in this interface. * - * @param option_id The option identifier + * @param optionId The option identifier * * @return The current value of the option * * @exception SocketException If an error occurs */ - Object getOption(int option_id) throws SocketException; + Object getOption(int optionId) throws SocketException; } // interface SocketOptions -- cgit v1.1