OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tom Tromey 2019-06-10 22:49:04 +02:00 committed by Tom Tromey
parent 8c2e74f181
commit 86108c1311
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

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

12
gdb/darwin-nat.c
View File

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