From b81cc7d6249671a2c1e36f6c8ac01da0e0b7c612 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Fri, 31 Oct 2014 20:32:02 +0000 Subject: StdLib: Fix more GCC warnings/errors caused by variables being set but 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 Reviewed by: Daryl McDaniel git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16286 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Python/Python-2.7.2/Modules/getnameinfo.c | 20 ++++++++++---- .../Python/Python-2.7.2/Parser/parsetok.c | 22 +++++++++++---- .../Sockets/GetHostByDns/GetHostByDns.c | 24 ++++------------ .../Sockets/GetHostByName/GetHostByName.c | 32 ++++++---------------- .../Sockets/GetNetByName/GetNetByName.c | 28 ++++++------------- .../Sockets/GetServByName/GetServByName.c | 28 ++++++------------- .../Sockets/GetServByPort/GetServByPort.c | 28 ++++++------------- 7 files changed, 69 insertions(+), 113 deletions(-) (limited to 'AppPkg') diff --git a/AppPkg/Applications/Python/Python-2.7.2/Modules/getnameinfo.c b/AppPkg/Applications/Python/Python-2.7.2/Modules/getnameinfo.c index f29d97f9df..c199d662e6 100644 --- a/AppPkg/Applications/Python/Python-2.7.2/Modules/getnameinfo.c +++ b/AppPkg/Applications/Python/Python-2.7.2/Modules/getnameinfo.c @@ -1,4 +1,14 @@ -/* +/** @file + Copyright (c) 2014, 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 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. * @@ -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 @@ -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]; @@ -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) { diff --git a/AppPkg/Applications/Python/Python-2.7.2/Parser/parsetok.c b/AppPkg/Applications/Python/Python-2.7.2/Parser/parsetok.c index 6446b10a22..f086449e1c 100644 --- a/AppPkg/Applications/Python/Python-2.7.2/Parser/parsetok.c +++ b/AppPkg/Applications/Python/Python-2.7.2/Parser/parsetok.c @@ -1,6 +1,15 @@ - -/* Parser-tokenizer link implementation */ - +/** @file + Parser-tokenizer link implementation. + + Copyright (c) 2014, 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 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" @@ -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"); @@ -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 -- diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c index 83fa60c333..e87b04f6d1 100644 --- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c +++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.c @@ -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.
+ 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 #include #include @@ -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 @@ -43,7 +40,6 @@ main ( IN char **Argv ) { - int AppStatus; UINT8 * pIpAddress; struct hostent * pHost; @@ -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 \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 ); @@ -77,9 +68,6 @@ main ( pIpAddress[3]); } } - - // // All done - // return errno; } diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c index 1bddc614ea..4d4fe5460e 100644 --- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c +++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.c @@ -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.
+ 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 #include #include @@ -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. @@ -41,7 +38,6 @@ main ( IN char **Argv ) { - int AppStatus; UINTN Index; struct hostent * pHost; UINT8 * pIpAddress; @@ -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 \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 ); @@ -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", @@ -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" ); @@ -115,9 +102,6 @@ main ( } } } - - // // All done - // return errno; } diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c index f4e0aca1a1..7ce741c08c 100644 --- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c +++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.c @@ -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.
+ 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 #include #include @@ -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. @@ -41,7 +38,6 @@ main ( IN char **Argv ) { - int AppStatus; UINT8 * pIpAddress; struct netent * pNetwork; @@ -49,17 +45,12 @@ main ( "%a starting\r\n", Argv[0])); - // // Determine if the network name is specified - // - AppStatus = 0; if ( 1 == Argc ) { Print ( L"%a \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 ); @@ -75,9 +66,6 @@ main ( pIpAddress[3]); } } - - // // All done - // return errno; } diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.c b/AppPkg/Applications/Sockets/GetServByName/GetServByName.c index bd32d1d344..dede76baf2 100644 --- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.c +++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.c @@ -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.
+ 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 #include #include @@ -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. @@ -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 \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 ); @@ -68,9 +59,6 @@ main ( pService->s_proto ); } } - - // // All done - // return errno; } diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c index 1b8dcd32ea..69441e1bc0 100644 --- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c +++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.c @@ -1,17 +1,15 @@ /** @file Translate the port number into a service name - 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.
+ 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 #include #include @@ -27,11 +25,10 @@ char mBuffer[65536]; -/** - Translate the port number into a service name +/** Translate the port number into a service name - @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. @@ -42,22 +39,16 @@ main ( IN char **Argv ) { - int AppStatus; int PortNumber; struct servent * pService; - // // Determine if the service name is specified - // - AppStatus = 0; if (( 2 != Argc ) || ( 1 != sscanf ( Argv[1], "%d", &PortNumber ))) { Print ( L"%a \r\n", Argv[0]); } else { - // // Translate the port number - // pService = getservbyport ( htons ( PortNumber ), NULL ); if ( NULL == pService ) { Print ( L"ERROR - service not found, errno: %d\r\n", errno ); @@ -69,9 +60,6 @@ main ( pService->s_proto ); } } - - // // All done - // return errno; } -- cgit v1.2.3