diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2008-04-17 09:28:55 +0000 |
|---|---|---|
| committer | Samuel Tardieu <sam@gcc.gnu.org> | 2008-04-17 09:28:55 +0000 |
| commit | 35485e124cb43114a6c634ce37d8a8c709000cc3 (patch) | |
| tree | a3478002edcfd090497f1098a3226f5b3ca48068 | |
| parent | 111c1cd945f6ba16f5e614e299d7b297961252cf (diff) | |
| download | gcc-35485e124cb43114a6c634ce37d8a8c709000cc3.zip gcc-35485e124cb43114a6c634ce37d8a8c709000cc3.tar.gz gcc-35485e124cb43114a6c634ce37d8a8c709000cc3.tar.bz2 | |
g-socket.ads, [...] (Get_Address): Make Stream a "not null" parameter.
gcc/ada/
* g-socket.ads, g-socket.adb (Get_Address): Make Stream a
"not null" parameter.
From-SVN: r134386
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/g-socket.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/g-socket.ads | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4b509a1..e02847f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2008-04-17 Samuel Tardieu <sam@rfc1149.net> + * g-socket.ads, g-socket.adb (Get_Address): Make Stream a + "not null" parameter. + +2008-04-17 Samuel Tardieu <sam@rfc1149.net> + * g-socket.adb: Add a message "IPv6 not supported" to the Socket_Error exception. diff --git a/gcc/ada/g-socket.adb b/gcc/ada/g-socket.adb index f561010..981495f 100644 --- a/gcc/ada/g-socket.adb +++ b/gcc/ada/g-socket.adb @@ -763,11 +763,11 @@ package body GNAT.Sockets is -- Get_Address -- ----------------- - function Get_Address (Stream : Stream_Access) return Sock_Addr_Type is + function Get_Address + (Stream : not null Stream_Access) return Sock_Addr_Type + is begin - if Stream = null then - raise Socket_Error; - elsif Stream.all in Datagram_Socket_Stream_Type then + if Stream.all in Datagram_Socket_Stream_Type then return Datagram_Socket_Stream_Type (Stream.all).From; else return Get_Peer_Name (Stream_Socket_Stream_Type (Stream.all).Socket); diff --git a/gcc/ada/g-socket.ads b/gcc/ada/g-socket.ads index 0ed1be0..55b6813 100644 --- a/gcc/ada/g-socket.ads +++ b/gcc/ada/g-socket.ads @@ -900,7 +900,8 @@ package GNAT.Sockets is -- Create a stream associated with a datagram-based socket that is already -- bound. Send_To is the socket address to which messages are being sent. - function Get_Address (Stream : Stream_Access) return Sock_Addr_Type; + function Get_Address + (Stream : not null Stream_Access) return Sock_Addr_Type; -- Return the socket address from which the last message was received procedure Free is new Ada.Unchecked_Deallocation |