[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-344-g8a28086

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  8a2808681e932b6644f572717885c8f8f360e9fa (commit)
      from  80eb7e2a789939263662cf37e564d0afcdb0e188 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a2808681e932b6644f572717885c8f8f360e9fa
Author: Oyvind Harboe <oyv...@zy...>
Date:   Thu Jun 17 15:30:25 2010 +0200

    gdb-server: fix -Wshadow warning
    
    This warning was only reproducable with
    Cygwin.
    
    Cygwin now builds without warnings for the basic
    case.
    
    Signed-off-by: Oyvind Harboe <oyv...@zy...>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index a1ff7c8..e97839d 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1,3 +1,4 @@
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dom...@gm...                                                   *
@@ -760,22 +761,22 @@ static void gdb_frontend_halted(struct target *target, struct connection *connec
 	if (gdb_connection->frontend_state == TARGET_RUNNING)
 	{
 		char sig_reply[4];
-		int signal;
+		int signal_var;
 
 		/* stop forwarding log packets! */
 		log_remove_callback(gdb_log_callback, connection);
 
 		if (gdb_connection->ctrl_c)
 		{
-			signal = 0x2;
+			signal_var = 0x2;
 			gdb_connection->ctrl_c = 0;
 		}
 		else
 		{
-			signal = gdb_last_signal(target);
+			signal_var = gdb_last_signal(target);
 		}
 
-		snprintf(sig_reply, 4, "T%2.2x", signal);
+		snprintf(sig_reply, 4, "T%2.2x", signal_var);
 		gdb_put_packet(connection, sig_reply, 3);
 		gdb_connection->frontend_state = TARGET_HALTED;
 	}
@@ -945,11 +946,11 @@ static int gdb_last_signal_packet(struct connection *connection,
 		struct target *target, char* packet, int packet_size)
 {
 	char sig_reply[4];
-	int signal;
+	int signal_var;
 
-	signal = gdb_last_signal(target);
+	signal_var = gdb_last_signal(target);
 
-	snprintf(sig_reply, 4, "S%2.2x", signal);
+	snprintf(sig_reply, 4, "S%2.2x", signal_var);
 	gdb_put_packet(connection, sig_reply, 3);
 
 	return ERROR_OK;

-----------------------------------------------------------------------

Summary of changes:
 src/server/gdb_server.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository