diff options
| author | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
| commit | 8c4ece5c36e153e739f344eccadd01b4c3e7ccce (patch) | |
| tree | 7a9b26ea0b84670c6a404f1873cde80dc5c28528 /lib/orber/src/orber_socket.erl | |
| parent | 45892fd845b74532a6cae750372b6e80eb8e3ad9 (diff) | |
| parent | 4414036566181c45f592036a03a3b5898f725d95 (diff) | |
| download | otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.gz otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.bz2 otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.zip | |
Merge branch 'nick/CORBA/avoid_warnings/OTP-9050' into dev
* nick/CORBA/avoid_warnings/OTP-9050:
Removed code commented out.
More specs removed.
More specs removed.
More specs removed.
Removed more spec:s that wasn't needed.
Removed spec:s that wasn't needed.
Updated light weight tests.
Updsated macro EFORMAT exit handling.
Corrected spec usage.
Eliminated Dialyzer warnings when using exit or throw.
Conflicts:
lib/cosEvent/doc/src/notes.xml
lib/cosEvent/vsn.mk
lib/cosEventDomain/doc/src/notes.xml
lib/cosEventDomain/vsn.mk
lib/cosNotification/vsn.mk
lib/cosProperty/doc/src/notes.xml
lib/cosProperty/vsn.mk
lib/cosTime/doc/src/notes.xml
lib/cosTime/vsn.mk
lib/orber/include/ifr_types.hrl
lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/src/orber_socket.erl')
| -rw-r--r-- | lib/orber/src/orber_socket.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl index 84ed193ebb..ec2cf8f42a 100644 --- a/lib/orber/src/orber_socket.erl +++ b/lib/orber/src/orber_socket.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -37,7 +37,7 @@ %%----------------------------------------------------------------- -export([start/0, connect/4, listen/3, listen/4, accept/2, accept/3, write/3, controlling_process/3, close/2, peername/2, sockname/2, - peerdata/2, peercert/2, peercert/3, sockdata/2, setopts/3, + peerdata/2, peercert/2, sockdata/2, setopts/3, clear/2, shutdown/3, post_accept/2, post_accept/3]). %%----------------------------------------------------------------- @@ -366,14 +366,6 @@ peercert(Type, _Socket) -> [?LINE, Type], ?DEBUG_LEVEL), {error, ebadsocket}. -peercert(ssl, Socket, Opts) -> - ssl:peercert(Socket, Opts); -peercert(Type, _Socket, Opts) -> - orber:dbg("[~p] orber_socket:peercert(~p, ~p);~n" - "Only available for SSL sockets.", - [?LINE, Type, Opts], ?DEBUG_LEVEL), - {error, ebadsocket}. - %%----------------------------------------------------------------- %% Get peerdata %% |