Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 217285 Details for
Bug 250055
dev-ada/adasockets fails to build
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
The patch created mainly by sed -r 's/: in ([^o]|.[^u]|..[^t])/: \1/'
1.8.6-style-checks.patch (text/plain), 19.04 KB, created by
Philipp Riegger
on 2010-01-24 00:26:42 UTC
(
hide
)
Description:
The patch created mainly by sed -r 's/: in ([^o]|.[^u]|..[^t])/: \1/'
Filename:
MIME Type:
Creator:
Philipp Riegger
Created:
2010-01-24 00:26:42 UTC
Size:
19.04 KB
patch
obsolete
>diff -ur adasockets-1.8.6.orig/examples/listener.adb adasockets-1.8.6/examples/listener.adb >--- adasockets-1.8.6.orig/examples/listener.adb 2010-01-24 01:00:32.045018000 +0100 >+++ adasockets-1.8.6/examples/listener.adb 2010-01-24 01:18:56.505021941 +0100 >@@ -50,7 +50,7 @@ > -- then telnet localhost 5000 > > task type Echo is >- entry Start (FD : in Socket_FD); >+ entry Start (FD : Socket_FD); > end Echo; > > function Rev (S : String) return String; >@@ -64,7 +64,7 @@ > Sock : Socket_FD; > begin > select >- accept Start (FD : in Socket_FD) do >+ accept Start (FD : Socket_FD) do > Sock := FD; > end Start; > or >diff -ur adasockets-1.8.6.orig/examples/stream_listener.adb adasockets-1.8.6/examples/stream_listener.adb >--- adasockets-1.8.6.orig/examples/stream_listener.adb 2010-01-24 01:00:32.045018000 +0100 >+++ adasockets-1.8.6/examples/stream_listener.adb 2010-01-24 01:18:56.515021052 +0100 >@@ -50,7 +50,7 @@ > -- then stream_sender localhost 5000 > > task type Echo is >- entry Start (FD : in Socket_FD); >+ entry Start (FD : Socket_FD); > end Echo; > > ---------- >@@ -62,7 +62,7 @@ > Stream : aliased Socket_Stream_Type; > begin > select >- accept Start (FD : in Socket_FD) do >+ accept Start (FD : Socket_FD) do > Sock := FD; > Initialize (Stream, Sock); > end Start; >diff -ur adasockets-1.8.6.orig/src/sockets-multicast.adb adasockets-1.8.6/src/sockets-multicast.adb >--- adasockets-1.8.6.orig/src/sockets-multicast.adb 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-multicast.adb 2010-01-24 01:09:25.675022365 +0100 >@@ -153,8 +153,8 @@ > -- Send -- > ---------- > >- procedure Send (Socket : in Multicast_Socket_FD; >- Data : in Stream_Element_Array) >+ procedure Send (Socket : Multicast_Socket_FD; >+ Data : Stream_Element_Array) > is > Sin : aliased Sockaddr_In := Socket.Target; > Index : Stream_Element_Offset := Data'First; >@@ -184,8 +184,8 @@ > > procedure Socket > (Sock : out Multicast_Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM) >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM) > is > begin > Raise_Exception (Program_Error'Identity, >diff -ur adasockets-1.8.6.orig/src/sockets-multicast.ads adasockets-1.8.6/src/sockets-multicast.ads >--- adasockets-1.8.6.orig/src/sockets-multicast.ads 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-multicast.ads 2010-01-24 01:09:25.685016171 +0100 >@@ -68,16 +68,16 @@ > -- to the local port Local_Port. Use 0 if you do not care about > -- the local port. > >- procedure Send (Socket : in Multicast_Socket_FD; >- Data : in Ada.Streams.Stream_Element_Array); >+ procedure Send (Socket : Multicast_Socket_FD; >+ Data : Ada.Streams.Stream_Element_Array); > -- Send data over a multicast socket > > private > > procedure Socket > (Sock : out Multicast_Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM); >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM); > pragma No_Return (Socket); > -- Do not call this one, it will raise Program_Error > >diff -ur adasockets-1.8.6.orig/src/sockets-naming.adb adasockets-1.8.6/src/sockets-naming.adb >--- adasockets-1.8.6.orig/src/sockets-naming.adb 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-naming.adb 2010-01-24 01:09:25.685016171 +0100 >@@ -67,8 +67,8 @@ > -- Parse an entry > > procedure Raise_Naming_Error >- (Errno : in Integer; >- Message : in String); >+ (Errno : Integer; >+ Message : String); > -- Raise the exception Naming_Error with an appropriate error message > > protected Naming_Lock is >@@ -462,8 +462,8 @@ > ------------------------ > > procedure Raise_Naming_Error >- (Errno : in Integer; >- Message : in String) >+ (Errno : Integer; >+ Message : String) > is > > function Error_Message return String; >diff -ur adasockets-1.8.6.orig/src/sockets-stream_io.adb adasockets-1.8.6/src/sockets-stream_io.adb >--- adasockets-1.8.6.orig/src/sockets-stream_io.adb 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-stream_io.adb 2010-01-24 01:09:25.705021938 +0100 >@@ -46,7 +46,7 @@ > > procedure Initialize > (Stream : in out Socket_Stream_Type; >- FD : in Socket_FD) >+ FD : Socket_FD) > is > begin > Stream.FD := FD; >@@ -72,7 +72,7 @@ > > procedure Write > (Stream : in out Socket_Stream_Type; >- Item : in Ada.Streams.Stream_Element_Array) >+ Item : Ada.Streams.Stream_Element_Array) > is > begin > Send (Stream.FD, Item); >diff -ur adasockets-1.8.6.orig/src/sockets-stream_io.ads adasockets-1.8.6/src/sockets-stream_io.ads >--- adasockets-1.8.6.orig/src/sockets-stream_io.ads 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-stream_io.ads 2010-01-24 01:09:25.705021938 +0100 >@@ -46,7 +46,7 @@ > > procedure Initialize > (Stream : in out Socket_Stream_Type; >- FD : in Socket_FD); >+ FD : Socket_FD); > -- Initialize must be called with an opened socket as parameter before > -- being used as a stream. > >@@ -57,7 +57,7 @@ > > procedure Write > (Stream : in out Socket_Stream_Type; >- Item : in Ada.Streams.Stream_Element_Array); >+ Item : Ada.Streams.Stream_Element_Array); > > private > >diff -ur adasockets-1.8.6.orig/src/sockets-utils.adb adasockets-1.8.6/src/sockets-utils.adb >--- adasockets-1.8.6.orig/src/sockets-utils.adb 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-utils.adb 2010-01-24 01:09:25.705021938 +0100 >@@ -67,8 +67,8 @@ > -- Raise_With_Message -- > ------------------------ > >- procedure Raise_With_Message (Message : in String; >- With_Errno : in Boolean := True) >+ procedure Raise_With_Message (Message : String; >+ With_Errno : Boolean := True) > is > Current_Errno : constant Integer := Errno; > begin >diff -ur adasockets-1.8.6.orig/src/sockets-utils.ads adasockets-1.8.6/src/sockets-utils.ads >--- adasockets-1.8.6.orig/src/sockets-utils.ads 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets-utils.ads 2010-01-24 01:09:25.705021938 +0100 >@@ -44,8 +44,8 @@ > > pragma Elaborate_Body; > >- procedure Raise_With_Message (Message : in String; >- With_Errno : in Boolean := True); >+ procedure Raise_With_Message (Message : String; >+ With_Errno : Boolean := True); > pragma No_Return (Raise_With_Message); > -- Raise Socket_Error with an associated error message > >diff -ur adasockets-1.8.6.orig/src/sockets.adb adasockets-1.8.6/src/sockets.adb >--- adasockets-1.8.6.orig/src/sockets.adb 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets.adb 2010-01-24 01:09:25.725020443 +0100 >@@ -94,7 +94,7 @@ > > CRLF : constant String := CR & LF; > >- procedure Refill (Socket : in Socket_FD'Class); >+ procedure Refill (Socket : Socket_FD'Class); > -- Refill the socket when in buffered mode by receiving one packet > -- and putting it in the buffer. > >@@ -124,7 +124,7 @@ > -- Accept_Socket -- > ------------------- > >- procedure Accept_Socket (Socket : in Socket_FD; >+ procedure Accept_Socket (Socket : Socket_FD; > New_Socket : out Socket_FD) > is > Sin : aliased Sockaddr_In; >@@ -147,9 +147,9 @@ > ---------- > > procedure Bind >- (Socket : in Socket_FD; >- Port : in Natural; >- Host : in String := "") >+ (Socket : Socket_FD; >+ Port : Natural; >+ Host : String := "") > is > Sin : aliased Sockaddr_In; > begin >@@ -168,9 +168,9 @@ > ------------- > > procedure Connect >- (Socket : in Socket_FD; >- Host : in String; >- Port : in Positive) >+ (Socket : Socket_FD; >+ Host : String; >+ Port : Positive) > is > Sin : aliased Sockaddr_In; > Current_Errno : Integer; >@@ -195,8 +195,8 @@ > -- Customized_Setsockopt -- > --------------------------- > >- procedure Customized_Setsockopt (Socket : in Socket_FD'Class; >- Optval : in Opt_Type) >+ procedure Customized_Setsockopt (Socket : Socket_FD'Class; >+ Optval : Opt_Type) > is > begin > pragma Assert (Optval'Size / 8 = Socket_Option_Size (Optname)); >@@ -268,7 +268,7 @@ > -- Get FD -- > ------------ > >- function Get_FD (Socket : in Socket_FD) >+ function Get_FD (Socket : Socket_FD) > return Interfaces.C.int > is > begin >@@ -323,9 +323,9 @@ > ---------------- > > procedure Getsockopt >- (Socket : in Socket_FD'Class; >- Level : in Socket_Level := SOL_SOCKET; >- Optname : in Socket_Option; >+ (Socket : Socket_FD'Class; >+ Level : Socket_Level := SOL_SOCKET; >+ Optname : Socket_Option; > Optval : out Integer) > is > Len : aliased int; >@@ -375,8 +375,8 @@ > ------------ > > procedure Listen >- (Socket : in Socket_FD; >- Queue_Size : in Positive := 5) >+ (Socket : Socket_FD; >+ Queue_Size : Positive := 5) > is > begin > if C_Listen (Socket.FD, int (Queue_Size)) = Failure then >@@ -388,8 +388,8 @@ > -- New_Line -- > -------------- > >- procedure New_Line (Socket : in Socket_FD'Class; >- Count : in Natural := 1) >+ procedure New_Line (Socket : Socket_FD'Class; >+ Count : Natural := 1) > is > begin > Put (Socket, CRLF * Count); >@@ -399,8 +399,8 @@ > -- Put -- > --------- > >- procedure Put (Socket : in Socket_FD'Class; >- Str : in String) >+ procedure Put (Socket : Socket_FD'Class; >+ Str : String) > is > Stream : Stream_Element_Array (Stream_Element_Offset (Str'First) .. > Stream_Element_Offset (Str'Last)); >@@ -416,7 +416,7 @@ > -- Put_Line -- > -------------- > >- procedure Put_Line (Socket : in Socket_FD'Class; Str : in String) >+ procedure Put_Line (Socket : Socket_FD'Class; Str : String) > is > begin > Put (Socket, Str & CRLF); >@@ -451,7 +451,7 @@ > -- Receive -- > ------------- > >- procedure Receive (Socket : in Socket_FD'Class; >+ procedure Receive (Socket : Socket_FD'Class; > Data : out Stream_Element_Array) > is > Index : Stream_Element_Offset := Data'First; >@@ -479,7 +479,7 @@ > -- Receive_Some -- > ------------------ > >- procedure Receive_Some (Socket : in Socket_FD'Class; >+ procedure Receive_Some (Socket : Socket_FD'Class; > Data : out Stream_Element_Array; > Last : out Stream_Element_Offset) > is >@@ -503,7 +503,7 @@ > ------------ > > procedure Refill >- (Socket : in Socket_FD'Class) >+ (Socket : Socket_FD'Class) > is > begin > pragma Assert (Socket.Buffer /= null); >@@ -515,8 +515,8 @@ > -- Send -- > ---------- > >- procedure Send (Socket : in Socket_FD; >- Data : in Stream_Element_Array) >+ procedure Send (Socket : Socket_FD; >+ Data : Stream_Element_Array) > is > Index : Stream_Element_Offset := Data'First; > Rest : Stream_Element_Count := Data'Length; >@@ -545,7 +545,7 @@ > > procedure Set_Buffer > (Socket : in out Socket_FD'Class; >- Length : in Positive := 1500) >+ Length : Positive := 1500) > is > begin > Unset_Buffer (Socket); >@@ -557,10 +557,10 @@ > ---------------- > > procedure Setsockopt >- (Socket : in Socket_FD'Class; >- Level : in Socket_Level := Sol_Socket; >- Optname : in Socket_Option; >- Optval : in Integer) >+ (Socket : Socket_FD'Class; >+ Level : Socket_Level := Sol_Socket; >+ Optname : Socket_Option; >+ Optval : Integer) > is > begin > case Socket_Option_Size (Optname) is >@@ -603,7 +603,7 @@ > -------------- > > procedure Shutdown (Socket : in out Socket_FD; >- How : in Shutdown_Type := Both) >+ How : Shutdown_Type := Both) > is > begin > if How /= Both then >@@ -628,8 +628,8 @@ > > procedure Socket > (Sock : out Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM) >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM) > is > Result : constant int := > C_Socket (Socket_Domain_Match (Domain), Socket_Type_Match (Typ), 0); >@@ -647,8 +647,8 @@ > procedure Socketpair > (Read_End : out Socket_FD; > Write_End : out Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM) >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM) > is > Filedes : aliased Two_Int; > Result : constant int := >diff -ur adasockets-1.8.6.orig/src/sockets.ads adasockets-1.8.6/src/sockets.ads >--- adasockets-1.8.6.orig/src/sockets.ads 2010-01-24 01:00:32.005020431 +0100 >+++ adasockets-1.8.6/src/sockets.ads 2010-01-24 01:09:25.725020443 +0100 >@@ -57,25 +57,25 @@ > > procedure Socket > (Sock : out Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM); >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM); > -- Create a socket of the given mode > > Connection_Refused : exception; > Socket_Error : exception; > > procedure Connect >- (Socket : in Socket_FD; >- Host : in String; >- Port : in Positive); >+ (Socket : Socket_FD; >+ Host : String; >+ Port : Positive); > -- Connect a socket on a given host/port. Raise Connection_Refused if > -- the connection has not been accepted by the other end, or > -- Socket_Error (with a more precise exception message) for another error. > > procedure Bind >- (Socket : in Socket_FD; >- Port : in Natural; >- Host : in String := ""); >+ (Socket : Socket_FD; >+ Port : Natural; >+ Host : String := ""); > -- Bind a socket on a given port. Using 0 for the port will tell the > -- OS to allocate a non-privileged free port. The port can be later > -- retrieved using Get_Sock_Port on the bound socket. >@@ -84,8 +84,8 @@ > -- Socket_Error can be raised if the system refuses to bind the port. > > procedure Listen >- (Socket : in Socket_FD; >- Queue_Size : in Positive := 5); >+ (Socket : Socket_FD; >+ Queue_Size : Positive := 5); > -- Create a socket's listen queue > > type Socket_Level is (SOL_SOCKET, IPPROTO_IP); >@@ -95,35 +95,35 @@ > IP_MULTICAST_LOOP, SO_SNDBUF, SO_RCVBUF); > > procedure Getsockopt >- (Socket : in Socket_FD'Class; >- Level : in Socket_Level := SOL_SOCKET; >- Optname : in Socket_Option; >+ (Socket : Socket_FD'Class; >+ Level : Socket_Level := SOL_SOCKET; >+ Optname : Socket_Option; > Optval : out Integer); > -- Get a socket option > > procedure Setsockopt >- (Socket : in Socket_FD'Class; >- Level : in Socket_Level := SOL_SOCKET; >- Optname : in Socket_Option; >- Optval : in Integer); >+ (Socket : Socket_FD'Class; >+ Level : Socket_Level := SOL_SOCKET; >+ Optname : Socket_Option; >+ Optval : Integer); > -- Set a socket option > > generic > Level : Socket_Level; > Optname : Socket_Option; > type Opt_Type is private; >- procedure Customized_Setsockopt (Socket : in Socket_FD'Class; >- Optval : in Opt_Type); >+ procedure Customized_Setsockopt (Socket : Socket_FD'Class; >+ Optval : Opt_Type); > -- Low level control on setsockopt > >- procedure Accept_Socket (Socket : in Socket_FD; >+ procedure Accept_Socket (Socket : Socket_FD; > New_Socket : out Socket_FD); > -- Accept a connection on a socket > > Connection_Closed : exception; > >- procedure Send (Socket : in Socket_FD; >- Data : in Ada.Streams.Stream_Element_Array); >+ procedure Send (Socket : Socket_FD; >+ Data : Ada.Streams.Stream_Element_Array); > -- Send data on a socket. Raise Connection_Closed if the socket > -- has been closed. > >@@ -132,13 +132,13 @@ > return Ada.Streams.Stream_Element_Array; > -- Receive data from a socket. May raise Connection_Closed > >- procedure Receive (Socket : in Socket_FD'Class; >+ procedure Receive (Socket : Socket_FD'Class; > Data : out Ada.Streams.Stream_Element_Array); > -- Get data from a socket. Raise Connection_Closed if the socket has > -- been closed before the end of the array. > > procedure Receive_Some >- (Socket : in Socket_FD'Class; >+ (Socket : Socket_FD'Class; > Data : out Ada.Streams.Stream_Element_Array; > Last : out Ada.Streams.Stream_Element_Offset); > -- Get some data from a socket. The index of the last element will >@@ -147,17 +147,17 @@ > type Shutdown_Type is (Receive, Send, Both); > > procedure Shutdown (Socket : in out Socket_FD; >- How : in Shutdown_Type := Both); >+ How : Shutdown_Type := Both); > -- Close a previously opened socket > > procedure Socketpair > (Read_End : out Socket_FD; > Write_End : out Socket_FD; >- Domain : in Socket_Domain := PF_INET; >- Typ : in Socket_Type := SOCK_STREAM); >+ Domain : Socket_Domain := PF_INET; >+ Typ : Socket_Type := SOCK_STREAM); > -- Create a socketpair. > >- function Get_FD (Socket : in Socket_FD) >+ function Get_FD (Socket : Socket_FD) > return Interfaces.C.int; > -- Get a socket's FD field > >@@ -165,16 +165,16 @@ > -- String-oriented subprograms -- > --------------------------------- > >- procedure Put (Socket : in Socket_FD'Class; >- Str : in String); >+ procedure Put (Socket : Socket_FD'Class; >+ Str : String); > -- Send a string on the socket > >- procedure New_Line (Socket : in Socket_FD'Class; >- Count : in Natural := 1); >+ procedure New_Line (Socket : Socket_FD'Class; >+ Count : Natural := 1); > -- Send CR/LF sequences on the socket > >- procedure Put_Line (Socket : in Socket_FD'Class; >- Str : in String); >+ procedure Put_Line (Socket : Socket_FD'Class; >+ Str : String); > -- Send a string + CR/LF on the socket > > function Get (Socket : Socket_FD'Class) return String; >@@ -195,7 +195,7 @@ > -- Function form for the former procedure > > procedure Set_Buffer (Socket : in out Socket_FD'Class; >- Length : in Positive := 1500); >+ Length : Positive := 1500); > -- Put socket in buffered mode. If the socket is already buffered, > -- the content of the previous buffer will be lost. The buffered mode > -- only affects read operation, through Get, Get_Char and Get_Line. Other
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=217285">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 250055
:
174439
| 217285 |
217286
