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 <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

2 files changed, 31 insertions, 11 deletions

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.<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.

  *

@@ -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>

@@ -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.<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"

@@ -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 --