diff options
| author | Tom Tromey <tromey@blackburn.act-europe.fr> | 2019-06-10 22:49:04 +0200 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-06-11 05:37:47 -0600 |
| commit | 86108c1311d82af6707d38e6d3dae1ec0aa92ec9 (patch) | |
| tree | 867ff972ed61494320c845ecff68004f248bbe24 /gdb | |
| parent | 8c2e74f18120dd2f2da7d653466c79dea6841b5e (diff) | |
| download | gdb-86108c1311d82af6707d38e6d3dae1ec0aa92ec9.zip gdb-86108c1311d82af6707d38e6d3dae1ec0aa92ec9.tar.gz gdb-86108c1311d82af6707d38e6d3dae1ec0aa92ec9.tar.bz2 | |
Remove shadowing from darwin-nat.c
Building on Darwin with gcc showed that darwin-nat.c had some
shadowing variable declarations. This removes them.
gdb/ChangeLog
2019-06-11 Tom Tromey <tromey@adacore.com>
* darwin-nat.c (darwin_decode_exception_message)
(darwin_decode_message, darwin_nat_target::kill): Fix shadowing.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/darwin-nat.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 022ce04..ba7ce7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-06-11 Tom Tromey <tromey@adacore.com> + + * darwin-nat.c (darwin_decode_exception_message) + (darwin_decode_message, darwin_nat_target::kill): Fix shadowing. + 2019-06-10 Andrew Burgess <andrew.burgess@embecosm.com> * valops.c (value_slice): Check for not allocated or not diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 8282ef2..d2cb683 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -687,7 +687,6 @@ darwin_decode_exception_message (mach_msg_header_t *hdr, /* Not a known inferior. This could happen if the child fork, as the created process will inherit its exception port. FIXME: should the exception port be restored ? */ - kern_return_t kret; mig_reply_error_t reply; inferior_debug @@ -1125,14 +1124,14 @@ darwin_decode_message (mach_msg_header_t *hdr, if (!priv->no_ptrace) { - pid_t res; + pid_t res_pid; int wstatus; - res = wait4 (inf->pid, &wstatus, 0, NULL); - if (res < 0 || res != inf->pid) + res_pid = wait4 (inf->pid, &wstatus, 0, NULL); + if (res_pid < 0 || res_pid != inf->pid) { printf_unfiltered (_("wait4: res=%d: %s\n"), - res, safe_strerror (errno)); + res_pid, safe_strerror (errno)); status->kind = TARGET_WAITKIND_IGNORE; return minus_one_ptid; } @@ -1148,7 +1147,7 @@ darwin_decode_message (mach_msg_header_t *hdr, } inferior_debug (4, _("darwin_wait: pid=%d exit, status=0x%x\n"), - res, wstatus); + res_pid, wstatus); /* Looks necessary on Leopard and harmless... */ wait4 (inf->pid, &wstatus, 0, NULL); @@ -1559,7 +1558,6 @@ darwin_nat_target::kill () signaled thus darwin_decode_message function knows that the kill signal was sent by gdb and will take the appropriate action (cancel signal and reply to the signal message). */ - darwin_inferior *priv = get_darwin_inferior (inf); for (darwin_thread_t *thread : priv->threads) thread->signaled = 1; |