diff options
| author | Oyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-17 15:30:25 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-17 15:41:07 +0200 |
| commit | 8a2808681e932b6644f572717885c8f8f360e9fa (patch) | |
| tree | 6667f6551b346d6d347b5153a35623a2f18dadad | |
| parent | 80eb7e2a789939263662cf37e564d0afcdb0e188 (diff) | |
| download | openocd_libswd-8a2808681e932b6644f572717885c8f8f360e9fa.tar.gz openocd_libswd-8a2808681e932b6644f572717885c8f8f360e9fa.tar.bz2 openocd_libswd-8a2808681e932b6644f572717885c8f8f360e9fa.tar.xz openocd_libswd-8a2808681e932b6644f572717885c8f8f360e9fa.zip | |
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 <oyvind.harboe@zylin.com>
| -rw-r--r-- | src/server/gdb_server.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index a1ff7c8e..e97839d2 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -1,3 +1,4 @@ + /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * @@ -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; |