Browse Source

* exec.c (xfer_memory): Fix compilation warning with old versions

of GCC.
        * tracepoint.c (trace_find_tracepoint_command): Likewise.
drow-cplus-branch
Joel Brobecker 24 years ago
parent
commit
3db26b01ff
  1. 6
      gdb/ChangeLog
  2. 42
      gdb/exec.c
  3. 10
      gdb/tracepoint.c

6
gdb/ChangeLog

@ -1,3 +1,9 @@
2002-09-12 Joel Brobecker <brobecker@gnat.com>
* exec.c (xfer_memory): Fix compilation warning with old versions
of GCC.
* tracepoint.c (trace_find_tracepoint_command): Likewise.
2002-09-12 David Carlton <carlton@math.stanford.edu>
* symtab.h: Run through gdb_indent.h.

42
gdb/exec.c

@ -507,26 +507,28 @@ xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
strcmp (section->name, p->the_bfd_section->name) != 0)
continue; /* not the section we need */
if (memaddr >= p->addr)
if (memend <= p->endaddr)
{
/* Entire transfer is within this section. */
res = xfer_fn (p->bfd, p->the_bfd_section, myaddr,
memaddr - p->addr, len);
return (res != 0) ? len : 0;
}
else if (memaddr >= p->endaddr)
{
/* This section ends before the transfer starts. */
continue;
}
else
{
/* This section overlaps the transfer. Just do half. */
len = p->endaddr - memaddr;
res = xfer_fn (p->bfd, p->the_bfd_section, myaddr,
memaddr - p->addr, len);
return (res != 0) ? len : 0;
}
{
if (memend <= p->endaddr)
{
/* Entire transfer is within this section. */
res = xfer_fn (p->bfd, p->the_bfd_section, myaddr,
memaddr - p->addr, len);
return (res != 0) ? len : 0;
}
else if (memaddr >= p->endaddr)
{
/* This section ends before the transfer starts. */
continue;
}
else
{
/* This section overlaps the transfer. Just do half. */
len = p->endaddr - memaddr;
res = xfer_fn (p->bfd, p->the_bfd_section, myaddr,
memaddr - p->addr, len);
return (res != 0) ? len : 0;
}
}
else
nextsectaddr = min (nextsectaddr, p->addr);
}

10
gdb/tracepoint.c

@ -2071,10 +2071,12 @@ trace_find_tracepoint_command (char *args, int from_tty)
if (target_is_remote ())
{
if (args == 0 || *args == 0)
if (tracepoint_number == -1)
error ("No current tracepoint -- please supply an argument.");
else
tdp = tracepoint_number; /* default is current TDP */
{
if (tracepoint_number == -1)
error ("No current tracepoint -- please supply an argument.");
else
tdp = tracepoint_number; /* default is current TDP */
}
else
tdp = parse_and_eval_long (args);

Loading…
Cancel
Save