diff options
Diffstat (limited to 'StdLib/BsdSocketLib')
| -rw-r--r-- | StdLib/BsdSocketLib/bind.c | 26 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/getsockopt.c | 28 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/listen.c | 26 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/poll.c | 35 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/res_update.c | 15 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/setsockopt.c | 38 |
6 files changed, 59 insertions, 109 deletions
diff --git a/StdLib/BsdSocketLib/bind.c b/StdLib/BsdSocketLib/bind.c index f544c94a47..a52272d7ce 100644 --- a/StdLib/BsdSocketLib/bind.c +++ b/StdLib/BsdSocketLib/bind.c @@ -1,22 +1,19 @@ /** @file
Implement the bind API.
- Copyright (c) 2011, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
+ Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
**/
-
#include <SocketInternals.h>
-/**
- Bind a name to a socket.
+/** Bind a name to a socket.
The bind routine connects a name (network address) to a socket on the local machine.
@@ -40,7 +37,6 @@ @return The bind routine returns zero (0) if successful and -1 upon failure.
In the case of an error, ::errno contains more information.
-
**/
int
bind (
@@ -51,25 +47,19 @@ bind ( {
int BindStatus;
EFI_SOCKET_PROTOCOL * pSocketProtocol;
- EFI_STATUS Status;
- //
// Locate the context for this socket
- //
pSocketProtocol = BslFdToSocketProtocol ( s, NULL, &errno );
if ( NULL != pSocketProtocol ) {
- //
+
// Bind the socket
- //
- Status = pSocketProtocol->pfnBind ( pSocketProtocol,
+ (void) pSocketProtocol->pfnBind ( pSocketProtocol,
name,
namelen,
&errno );
}
- //
// Return the operation stauts
- //
BindStatus = ( 0 == errno ) ? 0 : -1;
return BindStatus;
}
diff --git a/StdLib/BsdSocketLib/getsockopt.c b/StdLib/BsdSocketLib/getsockopt.c index 47b7c6fb34..8a77570cc5 100644 --- a/StdLib/BsdSocketLib/getsockopt.c +++ b/StdLib/BsdSocketLib/getsockopt.c @@ -1,22 +1,19 @@ /** @file
Implement the getsockopt API.
- Copyright (c) 2011, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
+ Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
**/
-
#include <SocketInternals.h>
-/**
- Get the socket options
+/** Get the socket options
The
<a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockopt.html#">POSIX</a>
@@ -31,7 +28,6 @@ @return This routine returns zero (0) if successful or -1 when an error occurs.
In the case of an error, ::errno contains more details.
-
**/
int
getsockopt (
@@ -44,27 +40,19 @@ getsockopt ( {
int OptionStatus;
EFI_SOCKET_PROTOCOL * pSocketProtocol;
- EFI_STATUS Status;
-
- //
+
// Locate the context for this socket
- //
pSocketProtocol = BslFdToSocketProtocol ( s, NULL, &errno );
if ( NULL != pSocketProtocol ) {
- //
// Get the socket option
- //
- Status = pSocketProtocol->pfnOptionGet ( pSocketProtocol,
+ (void) pSocketProtocol->pfnOptionGet ( pSocketProtocol,
level,
option_name,
option_value,
option_len,
&errno );
}
-
- //
// Return the operation stauts
- //
OptionStatus = ( 0 == errno ) ? 0 : -1;
return OptionStatus;
}
diff --git a/StdLib/BsdSocketLib/listen.c b/StdLib/BsdSocketLib/listen.c index 7c6d5f3d39..e8f6b91412 100644 --- a/StdLib/BsdSocketLib/listen.c +++ b/StdLib/BsdSocketLib/listen.c @@ -1,22 +1,19 @@ /** @file
Implement the listen API.
- Copyright (c) 2011, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
+ Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
**/
-
#include <SocketInternals.h>
-/**
- Establish the known port to listen for network connections.
+/** Establish the known port to listen for network connections.
The listen routine places the port into a state that enables connection
attempts. Connections are placed into FIFO order in a queue to be serviced
@@ -35,7 +32,6 @@ @return This routine returns zero (0) if successful or -1 when an error occurs.
In the case of an error, ::errno contains more details.
-
**/
int
listen (
@@ -45,24 +41,16 @@ listen ( {
int ListenStatus;
EFI_SOCKET_PROTOCOL * pSocketProtocol;
- EFI_STATUS Status;
- //
// Locate the context for this socket
- //
pSocketProtocol = BslFdToSocketProtocol ( s, NULL, &errno );
if ( NULL != pSocketProtocol ) {
- //
// Enable connections on the known port
- //
- Status = pSocketProtocol->pfnListen ( pSocketProtocol,
+ (void) pSocketProtocol->pfnListen ( pSocketProtocol,
backlog,
&errno );
}
-
- //
// Return the operation stauts
- //
ListenStatus = ( 0 == errno ) ? 0 : -1;
return ListenStatus;
}
diff --git a/StdLib/BsdSocketLib/poll.c b/StdLib/BsdSocketLib/poll.c index dc17567662..06a1b20973 100644 --- a/StdLib/BsdSocketLib/poll.c +++ b/StdLib/BsdSocketLib/poll.c @@ -1,29 +1,24 @@ /** @file
Implement the poll API.
- Copyright (c) 2011, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
+ Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
**/
-
#include <SocketInternals.h>
-/**
- Poll the socket for activity
+/** Poll the socket for activity
@param [in] pDescriptor Descriptor address for the file
-
@param [in] Events Mask of events to detect
@return Detected events for the socket
-
**/
short
EFIAPI
@@ -32,27 +27,19 @@ BslSocketPoll ( IN short Events
)
{
- short DetectedEvents;
+ short DetectedEvents;
EFI_SOCKET_PROTOCOL * pSocketProtocol;
- EFI_STATUS Status;
- //
// Locate the socket protocol
- //
DetectedEvents = 0;
pSocketProtocol = BslValidateSocketFd ( pDescriptor, &errno );
if ( NULL != pSocketProtocol ) {
- //
// Poll the socket
- //
- Status = pSocketProtocol->pfnPoll ( pSocketProtocol,
- Events,
- &DetectedEvents,
- &errno );
+ (void) pSocketProtocol->pfnPoll ( pSocketProtocol,
+ Events,
+ &DetectedEvents,
+ &errno );
}
-
- //
// Return the detected events
- //
return DetectedEvents;
}
diff --git a/StdLib/BsdSocketLib/res_update.c b/StdLib/BsdSocketLib/res_update.c index a01d83203c..be0f531092 100644 --- a/StdLib/BsdSocketLib/res_update.c +++ b/StdLib/BsdSocketLib/res_update.c @@ -1,3 +1,13 @@ +/** @file
+ Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available
+ under the terms and conditions of the BSD License which accompanies this
+ distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
/*
* Copyright (c) 1996 by Internet Software Consortium.
*
@@ -476,9 +486,9 @@ ans=%d, auth=%d, add=%d, rcode=%d\n", dname = zptr->z_ns[k].nsname;
qtype = T_A;
}
-
} /* while */
}
+ --ttl; // Suppress the "Set but not used" warning/error for ttl.
_res.options |= RES_DEBUG;
for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
@@ -502,8 +512,7 @@ ans=%d, auth=%d, add=%d, rcode=%d\n", } else
fprintf(stdout, "res_mkupdate: packet size = %d\n", n);
- /*
- * Override the list of NS records from res_init() with
+ /* Override the list of NS records from res_init() with
* the authoritative nameservers for the zone being updated.
* Sort primary to be the first in the list of nameservers.
*/
diff --git a/StdLib/BsdSocketLib/setsockopt.c b/StdLib/BsdSocketLib/setsockopt.c index 64f3a35911..ce2b6aff43 100644 --- a/StdLib/BsdSocketLib/setsockopt.c +++ b/StdLib/BsdSocketLib/setsockopt.c @@ -1,22 +1,19 @@ /** @file
Implement the setsockopt API.
- Copyright (c) 2011, Intel Corporation
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
+ Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
**/
-
#include <SocketInternals.h>
-/**
- Set the socket options
+/** Set the socket options
The
<a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/setsockopt.html">POSIX</a>
@@ -30,7 +27,6 @@ @return This routine returns zero (0) upon success and -1 when an error occurs.
In the case of an error, ::errno contains more details.
-
**/
int
setsockopt (
@@ -43,27 +39,19 @@ setsockopt ( {
int OptionStatus;
EFI_SOCKET_PROTOCOL * pSocketProtocol;
- EFI_STATUS Status;
-
- //
+
// Locate the context for this socket
- //
pSocketProtocol = BslFdToSocketProtocol ( s, NULL, &errno );
if ( NULL != pSocketProtocol ) {
- //
// Set the socket option
- //
- Status = pSocketProtocol->pfnOptionSet ( pSocketProtocol,
- level,
- option_name,
- option_value,
- option_len,
- &errno );
+ (void) pSocketProtocol->pfnOptionSet (pSocketProtocol,
+ level,
+ option_name,
+ option_value,
+ option_len,
+ &errno );
}
-
- //
// Return the operation stauts
- //
OptionStatus = ( 0 == errno ) ? 0 : -1;
return OptionStatus;
}
|