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

of GCC.
        * tracepoint.c (trace_find_tracepoint_command): Likewise.
This commit is contained in:
Joel Brobecker 2002-09-12 19:49:56 +00:00
parent 17c5ed2cf3
commit 3db26b01ff
3 changed files with 34 additions and 24 deletions

View file

@ -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> 2002-09-12 David Carlton <carlton@math.stanford.edu>
* symtab.h: Run through gdb_indent.h. * symtab.h: Run through gdb_indent.h.

View file

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

View file

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