Skip to content

Commit

Permalink
StdLib: Fix more GCC warnings/errors caused by variables being set bu…
Browse files Browse the repository at this point in the history 
…t not used.

Removed variables that had no effect on code behavior.
Normalized comment formatting.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed by: Daryl McDaniel <daryl.mcdaniel@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16286 6f19259b-4bc3-4df7-8a09-765794883524
  • Loading branch information
@oliviermartin
oliviermartin authored and darylm503 committed Oct 31, 2014
1 parent fe7ad7f commit b81cc7d
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 115 deletions.
20 changes: 14 additions & 6 deletions AppPkg/Applications/Python/Python-2.7.2/Modules/getnameinfo.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
/*
/** @file
Copyright (c) 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.
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
Expand All @@ -25,14 +35,12 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Issues to be discussed:
* - Thread safe-ness must be checked
* - Return values. There seems to be no standard for return value (RFC2133)
* but INRIA implementation returns EAI_xxx defined for getaddrinfo().
*/
**/

#if 0
#include <sys/types.h>
Expand Down Expand Up @@ -104,8 +112,8 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
u_long v4a;
#ifdef ENABLE_IPV6
u_char pfx;
#endif
int h_error;
#endif
char numserv[512];
char numaddr[512];

Expand Down Expand Up @@ -181,7 +189,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error);
#else
hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af);
h_error = h_errno;
//h_error = h_errno;
#endif

if (hp) {
Expand Down
22 changes: 17 additions & 5 deletions AppPkg/Applications/Python/Python-2.7.2/Parser/parsetok.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@

/* Parser-tokenizer link implementation */

/** @file
Parser-tokenizer link implementation.
Copyright (c) 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 "pgenheaders.h"
#include "tokenizer.h"
#include "node.h"
Expand Down Expand Up @@ -131,7 +140,9 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
{
parser_state *ps;
node *n;
int started = 0, handling_import = 0, handling_with = 0;
int started = 0;
//int handling_import = 0;
//int handling_with = 0;

if ((ps = PyParser_New(g, start)) == NULL) {
fprintf(stderr, "no mem for new parser\n");
Expand Down Expand Up @@ -163,7 +174,8 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
}
if (type == ENDMARKER && started) {
type = NEWLINE; /* Add an extra newline */
handling_with = handling_import = 0;
//handling_with = 0;
//handling_import = 0;
started = 0;
/* Add the right number of dedent tokens,
except if a certain flag is given --
Expand Down
24 changes: 6 additions & 18 deletions AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/** @file
Translate the host name into an IP address
Copyright (c) 2011-2012, 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 <errno.h>
#include <netdb.h>
#include <string.h>
Expand All @@ -28,8 +26,7 @@ struct hostent * _gethostbydnsname (const char *, int);
char mBuffer[65536];


/**
Translate the host name into an IP address
/** Translate the host name into an IP address
@param [in] Argc The number of arguments
@param [in] Argv The argument value array
Expand All @@ -43,25 +40,19 @@ main (
IN char **Argv
)
{
int AppStatus;
UINT8 * pIpAddress;
struct hostent * pHost;

DEBUG (( DEBUG_INFO,
"%a starting\r\n",
Argv[0]));

//
// Determine if the host name is specified
//
AppStatus = 0;
if ( 1 == Argc ) {
Print ( L"%a <host name>\r\n", Argv[0]);
}
else {
//
// Translate the host name
//
pHost = _gethostbydnsname ( Argv[1], AF_INET );
if ( NULL == pHost ) {
Print ( L"ERROR - host not found, h_errno: %d\r\n", h_errno );
Expand All @@ -77,9 +68,6 @@ main (
pIpAddress[3]);
}
}

//
// All done
//
return errno;
}
32 changes: 8 additions & 24 deletions AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/** @file
Translate the host name into an IP address
Copyright (c) 2011-2012, 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 <errno.h>
#include <netdb.h>
#include <string.h>
Expand All @@ -26,11 +24,10 @@
char mBuffer[65536];


/**
Translate the host name into an IP address
/** Translate the host name into an IP address
@param [in] Argc The number of arguments
@param [in] Argv The argument value array
@param[in] Argc The number of arguments
@param[in] Argv The argument value array
@retval 0 The application exited normally.
@retval Other An error occurred.
Expand All @@ -41,7 +38,6 @@ main (
IN char **Argv
)
{
int AppStatus;
UINTN Index;
struct hostent * pHost;
UINT8 * pIpAddress;
Expand All @@ -51,17 +47,12 @@ main (
"%a starting\r\n",
Argv[0]));

//
// Determine if the host name is specified
//
AppStatus = 0;
if ( 1 == Argc ) {
Print ( L"%a <host name>\r\n", Argv[0]);
}
else {
//
// Translate the host name
//
pHost = gethostbyname ( Argv[1]);
if ( NULL == pHost ) {
Print ( L"ERROR - host not found, h_errno: %d\r\n", h_errno );
Expand All @@ -76,9 +67,7 @@ main (
pHost->h_addrtype,
pHost->h_name );

//
// Display the other addresses
//
for ( Index = 1; NULL != pHost->h_addr_list[Index]; Index++ ) {
pIpAddress = (UINT8 *)pHost->h_addr_list[Index];
Print ( L"%d.%d.%d.%d\r\n",
Expand All @@ -88,9 +77,7 @@ main (
pIpAddress[3]);
}

//
// Display the list of aliases
//
ppName = pHost->h_aliases;
if (( NULL == ppName ) || ( NULL == *ppName )) {
Print ( L"No aliases\r\n" );
Expand All @@ -115,9 +102,6 @@ main (
}
}
}

//
// All done
//
return errno;
}
28 changes: 8 additions & 20 deletions AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/** @file
Translate the network name into an IP address
Copyright (c) 2011-2012, 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 <errno.h>
#include <netdb.h>
#include <string.h>
Expand All @@ -26,11 +24,10 @@
char mBuffer[65536];


/**
Translate the network name into an IP address
/** Translate the network name into an IP address
@param [in] Argc The number of arguments
@param [in] Argv The argument value array
@param[in] Argc The number of arguments
@param[in] Argv The argument value array
@retval 0 The application exited normally.
@retval Other An error occurred.
Expand All @@ -41,25 +38,19 @@ main (
IN char **Argv
)
{
int AppStatus;
UINT8 * pIpAddress;
struct netent * pNetwork;

DEBUG (( DEBUG_INFO,
"%a starting\r\n",
Argv[0]));

//
// Determine if the network name is specified
//
AppStatus = 0;
if ( 1 == Argc ) {
Print ( L"%a <network name>\r\n", Argv[0]);
}
else {
//
// Translate the net name
//
pNetwork = getnetbyname ( Argv[1]);
if ( NULL == pNetwork ) {
Print ( L"ERROR - network not found, errno: %d\r\n", errno );
Expand All @@ -75,9 +66,6 @@ main (
pIpAddress[3]);
}
}

//
// All done
//
return errno;
}
28 changes: 8 additions & 20 deletions AppPkg/Applications/Sockets/GetServByName/GetServByName.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/** @file
Translate the service name into a port number
Copyright (c) 2011-2012, 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 <errno.h>
#include <netdb.h>
#include <string.h>
Expand All @@ -26,11 +24,10 @@
char mBuffer[65536];


/**
Translate the service name into a port number
/** Translate the service name into a port number
@param [in] Argc The number of arguments
@param [in] Argv The argument value array
@param[in] Argc The number of arguments
@param[in] Argv The argument value array
@retval 0 The application exited normally.
@retval Other An error occurred.
Expand All @@ -41,21 +38,15 @@ main (
IN char **Argv
)
{
int AppStatus;
int PortNumber;
struct servent * pService;

//
// Determine if the service name is specified
//
AppStatus = 0;
if ( 1 == Argc ) {
Print ( L"%a <service name>\r\n", Argv[0]);
}
else {
//
// Translate the service name
//
pService = getservbyname ( Argv[1], NULL );
if ( NULL == pService ) {
Print ( L"ERROR - service not found, errno: %d\r\n", errno );
Expand All @@ -68,9 +59,6 @@ main (
pService->s_proto );
}
}

//
// All done
//
return errno;
}
Loading

0 comments on commit b81cc7d

Please sign in to comment.