constify to_open
This makes target_ops::to_open take a const string and then fixes the fallout. There were a few of these I could not build. However I eyeballed it and in any case the fixes should generally be trivial. This is based on the patch to fix up the target debugging for to_open, because that changes gdb to not directly install to_open as the target command 2014-07-30 Tom Tromey <tromey@redhat.com> * bsd-kvm.c (bsd_kvm_open): Constify. * corelow.c (core_open): Constify. * ctf.c (ctf_open): Constify. * dbug-rom.c (dbug_open): Constify. * exec.c (exec_open): Constify. * m32r-rom.c (m32r_open, mon2000_open): Constify. * microblaze-rom.c (picobug_open): Constify. * nto-procfs.c (procfs_open_1, procfs_open, procfs_native_open): Constify. * ppcbug-rom.c (ppcbug_open0, ppcbug_open1): Constify. * record-btrace.c (record_btrace_open): Constify. * record-full.c (record_full_core_open_1, record_full_open_1) (record_full_open): Constify. * remote-m32r-sdi.c (m32r_open): Constify. * remote-mips.c (common_open, mips_open, pmon_open, ddb_open) (rockhopper_open, lsi_open): Constify. * remote-sim.c (gdbsim_open): Constify. * remote.c (remote_open, extended_remote_open, remote_open_1): Constify. * target.h (struct target_ops) <to_open>: Make "arg" const. * tracefile-tfile.c (tfile_open): Constify.
This commit is contained in:
parent
e799154c3b
commit
014f9477f4
@ -1,3 +1,27 @@
|
||||
2014-07-30 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* bsd-kvm.c (bsd_kvm_open): Constify.
|
||||
* corelow.c (core_open): Constify.
|
||||
* ctf.c (ctf_open): Constify.
|
||||
* dbug-rom.c (dbug_open): Constify.
|
||||
* exec.c (exec_open): Constify.
|
||||
* m32r-rom.c (m32r_open, mon2000_open): Constify.
|
||||
* microblaze-rom.c (picobug_open): Constify.
|
||||
* nto-procfs.c (procfs_open_1, procfs_open, procfs_native_open):
|
||||
Constify.
|
||||
* ppcbug-rom.c (ppcbug_open0, ppcbug_open1): Constify.
|
||||
* record-btrace.c (record_btrace_open): Constify.
|
||||
* record-full.c (record_full_core_open_1, record_full_open_1)
|
||||
(record_full_open): Constify.
|
||||
* remote-m32r-sdi.c (m32r_open): Constify.
|
||||
* remote-mips.c (common_open, mips_open, pmon_open, ddb_open)
|
||||
(rockhopper_open, lsi_open): Constify.
|
||||
* remote-sim.c (gdbsim_open): Constify.
|
||||
* remote.c (remote_open, extended_remote_open, remote_open_1):
|
||||
Constify.
|
||||
* target.h (struct target_ops) <to_open>: Make "arg" const.
|
||||
* tracefile-tfile.c (tfile_open): Constify.
|
||||
|
||||
2014-07-30 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* breakpoint.c (map_breakpoint_numbers): Update.
|
||||
|
@ -63,19 +63,20 @@ static struct target_ops bsd_kvm_ops;
|
||||
static ptid_t bsd_kvm_ptid;
|
||||
|
||||
static void
|
||||
bsd_kvm_open (char *filename, int from_tty)
|
||||
bsd_kvm_open (const char *arg, int from_tty)
|
||||
{
|
||||
char errbuf[_POSIX2_LINE_MAX];
|
||||
char *execfile = NULL;
|
||||
kvm_t *temp_kd;
|
||||
char *filename = NULL;
|
||||
|
||||
target_preopen (from_tty);
|
||||
|
||||
if (filename)
|
||||
if (arg)
|
||||
{
|
||||
char *temp;
|
||||
|
||||
filename = tilde_expand (filename);
|
||||
filename = tilde_expand (arg);
|
||||
if (filename[0] != '/')
|
||||
{
|
||||
temp = concat (current_directory, "/", filename, (char *)NULL);
|
||||
|
@ -84,8 +84,6 @@ static struct core_fns *sniff_core_bfd (bfd *);
|
||||
|
||||
static int gdb_check_format (bfd *);
|
||||
|
||||
static void core_open (char *, int);
|
||||
|
||||
static void core_close (struct target_ops *self);
|
||||
|
||||
static void core_close_cleanup (void *ignore);
|
||||
@ -275,7 +273,7 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
|
||||
/* This routine opens and sets up the core file bfd. */
|
||||
|
||||
static void
|
||||
core_open (char *filename, int from_tty)
|
||||
core_open (const char *arg, int from_tty)
|
||||
{
|
||||
const char *p;
|
||||
int siggy;
|
||||
@ -285,9 +283,10 @@ core_open (char *filename, int from_tty)
|
||||
int scratch_chan;
|
||||
int flags;
|
||||
volatile struct gdb_exception except;
|
||||
char *filename;
|
||||
|
||||
target_preopen (from_tty);
|
||||
if (!filename)
|
||||
if (!arg)
|
||||
{
|
||||
if (core_bfd)
|
||||
error (_("No core file specified. (Use `detach' "
|
||||
@ -296,7 +295,7 @@ core_open (char *filename, int from_tty)
|
||||
error (_("No core file specified."));
|
||||
}
|
||||
|
||||
filename = tilde_expand (filename);
|
||||
filename = tilde_expand (arg);
|
||||
if (!IS_ABSOLUTE_PATH (filename))
|
||||
{
|
||||
temp = concat (current_directory, "/",
|
||||
|
@ -904,7 +904,7 @@ ctf_destroy (void)
|
||||
/* Open CTF trace data in DIRNAME. */
|
||||
|
||||
static void
|
||||
ctf_open_dir (char *dirname)
|
||||
ctf_open_dir (const char *dirname)
|
||||
{
|
||||
struct bt_iter_pos begin_pos;
|
||||
struct bt_iter_pos *pos;
|
||||
@ -1127,7 +1127,7 @@ ctf_read_tp (struct uploaded_tp **uploaded_tps)
|
||||
second packet which contains events on trace blocks. */
|
||||
|
||||
static void
|
||||
ctf_open (char *dirname, int from_tty)
|
||||
ctf_open (const char *dirname, int from_tty)
|
||||
{
|
||||
struct bt_ctf_event *event;
|
||||
uint32_t event_id;
|
||||
|
@ -32,8 +32,6 @@
|
||||
|
||||
#include "m68k-tdep.h"
|
||||
|
||||
static void dbug_open (char *args, int from_tty);
|
||||
|
||||
static void
|
||||
dbug_supply_register (struct regcache *regcache, char *regname,
|
||||
int regnamelen, char *val, int vallen)
|
||||
@ -155,7 +153,7 @@ init_dbug_cmds (void)
|
||||
} /* init_debug_ops */
|
||||
|
||||
static void
|
||||
dbug_open (char *args, int from_tty)
|
||||
dbug_open (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &dbug_cmds, from_tty);
|
||||
}
|
||||
|
@ -26,8 +26,6 @@
|
||||
#include "inferior.h"
|
||||
#include "regcache.h"
|
||||
|
||||
static void dink32_open (char *args, int from_tty);
|
||||
|
||||
static void
|
||||
dink32_supply_register (struct regcache *regcache, char *regname,
|
||||
int regnamelen, char *val, int vallen)
|
||||
@ -123,7 +121,7 @@ static char *dink32_inits[] =
|
||||
static struct monitor_ops dink32_cmds;
|
||||
|
||||
static void
|
||||
dink32_open (char *args, int from_tty)
|
||||
dink32_open (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &dink32_cmds, from_tty);
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ show_write_files (struct ui_file *file, int from_tty,
|
||||
|
||||
|
||||
static void
|
||||
exec_open (char *args, int from_tty)
|
||||
exec_open (const char *args, int from_tty)
|
||||
{
|
||||
target_preopen (from_tty);
|
||||
exec_file_attach (args, from_tty);
|
||||
|
@ -133,7 +133,7 @@ inf_child_open_target (struct target_ops *target, const char *arg,
|
||||
}
|
||||
|
||||
static void
|
||||
inf_child_open (char *arg, int from_tty)
|
||||
inf_child_open (const char *arg, int from_tty)
|
||||
{
|
||||
inf_child_open_target (inf_child_ops, arg, from_tty);
|
||||
}
|
||||
|
@ -201,9 +201,6 @@ m32r_load_gen (struct target_ops *self, const char *filename, int from_tty)
|
||||
generic_load (filename, from_tty);
|
||||
}
|
||||
|
||||
static void m32r_open (char *args, int from_tty);
|
||||
static void mon2000_open (char *args, int from_tty);
|
||||
|
||||
/* This array of registers needs to match the indexes used by GDB. The
|
||||
whole reason this exists is because the various ROM monitors use
|
||||
different names than GDB does, and don't support all the registers
|
||||
@ -362,7 +359,7 @@ init_m32r_cmds (void)
|
||||
} /* init_m32r_cmds */
|
||||
|
||||
static void
|
||||
m32r_open (char *args, int from_tty)
|
||||
m32r_open (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &m32r_cmds, from_tty);
|
||||
}
|
||||
@ -422,7 +419,7 @@ init_mon2000_cmds (void)
|
||||
} /* init_mon2000_cmds */
|
||||
|
||||
static void
|
||||
mon2000_open (char *args, int from_tty)
|
||||
mon2000_open (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &mon2000_cmds, from_tty);
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ static char *picobug_regnames[] = {
|
||||
|
||||
|
||||
static void
|
||||
picobug_open (char *args, int from_tty)
|
||||
picobug_open (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &picobug_cmds, from_tty);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ procfs_is_nto_target (bfd *abfd)
|
||||
will be a QNX node string, eg: "/net/some_node". If arg is not a
|
||||
valid QNX node, we will default to local. */
|
||||
static void
|
||||
procfs_open_1 (struct target_ops *ops, char *arg, int from_tty)
|
||||
procfs_open_1 (struct target_ops *ops, const char *arg, int from_tty)
|
||||
{
|
||||
char *nodestr;
|
||||
char *endstr;
|
||||
@ -1395,7 +1395,7 @@ static struct target_ops *nto_native_ops;
|
||||
/* to_open implementation for "target procfs". */
|
||||
|
||||
static void
|
||||
procfs_open (char *arg, int from_tty)
|
||||
procfs_open (const char *arg, int from_tty)
|
||||
{
|
||||
procfs_open_1 (&nto_procfs_ops, arg, from_tty);
|
||||
}
|
||||
@ -1403,7 +1403,7 @@ procfs_open (char *arg, int from_tty)
|
||||
/* to_open implementation for "target native". */
|
||||
|
||||
static void
|
||||
procfs_native_open (char *arg, int from_tty)
|
||||
procfs_native_open (const char *arg, int from_tty)
|
||||
{
|
||||
procfs_open_1 (nto_native_ops, arg, from_tty);
|
||||
}
|
||||
|
@ -184,13 +184,13 @@ static struct monitor_ops ppcbug_cmds0;
|
||||
static struct monitor_ops ppcbug_cmds1;
|
||||
|
||||
static void
|
||||
ppcbug_open0 (char *args, int from_tty)
|
||||
ppcbug_open0 (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &ppcbug_cmds0, from_tty);
|
||||
}
|
||||
|
||||
static void
|
||||
ppcbug_open1 (char *args, int from_tty)
|
||||
ppcbug_open1 (const char *args, int from_tty)
|
||||
{
|
||||
monitor_open (args, &ppcbug_cmds1, from_tty);
|
||||
}
|
||||
|
@ -188,7 +188,7 @@ record_btrace_handle_async_inferior_event (gdb_client_data data)
|
||||
/* The to_open method of target record-btrace. */
|
||||
|
||||
static void
|
||||
record_btrace_open (char *args, int from_tty)
|
||||
record_btrace_open (const char *args, int from_tty)
|
||||
{
|
||||
struct cleanup *disable_chain;
|
||||
struct thread_info *tp;
|
||||
|
@ -792,7 +792,7 @@ record_full_async_inferior_event_handler (gdb_client_data data)
|
||||
/* Open the process record target. */
|
||||
|
||||
static void
|
||||
record_full_core_open_1 (char *name, int from_tty)
|
||||
record_full_core_open_1 (const char *name, int from_tty)
|
||||
{
|
||||
struct regcache *regcache = get_current_regcache ();
|
||||
int regnum = gdbarch_num_regs (get_regcache_arch (regcache));
|
||||
@ -822,7 +822,7 @@ record_full_core_open_1 (char *name, int from_tty)
|
||||
/* "to_open" target method for 'live' processes. */
|
||||
|
||||
static void
|
||||
record_full_open_1 (char *name, int from_tty)
|
||||
record_full_open_1 (const char *name, int from_tty)
|
||||
{
|
||||
if (record_debug)
|
||||
fprintf_unfiltered (gdb_stdlog, "Process record: record_full_open\n");
|
||||
@ -846,7 +846,7 @@ static void record_full_init_record_breakpoints (void);
|
||||
/* "to_open" target method. Open the process record target. */
|
||||
|
||||
static void
|
||||
record_full_open (char *name, int from_tty)
|
||||
record_full_open (const char *name, int from_tty)
|
||||
{
|
||||
struct target_ops *t;
|
||||
|
||||
|
@ -359,7 +359,7 @@ m32r_create_inferior (struct target_ops *ops, char *execfile,
|
||||
NAME is the filename used for communication. */
|
||||
|
||||
static void
|
||||
m32r_open (char *args, int from_tty)
|
||||
m32r_open (const char *args, int from_tty)
|
||||
{
|
||||
struct hostent *host_ent;
|
||||
struct sockaddr_in server_addr;
|
||||
|
@ -77,14 +77,6 @@ static ULONGEST mips_request (int cmd, ULONGEST addr, ULONGEST data,
|
||||
|
||||
static void mips_initialize (void);
|
||||
|
||||
static void mips_open (char *name, int from_tty);
|
||||
|
||||
static void pmon_open (char *name, int from_tty);
|
||||
|
||||
static void ddb_open (char *name, int from_tty);
|
||||
|
||||
static void lsi_open (char *name, int from_tty);
|
||||
|
||||
static void mips_close (struct target_ops *self);
|
||||
|
||||
static int mips_map_regno (struct gdbarch *, int);
|
||||
@ -1541,7 +1533,7 @@ mips_initialize (void)
|
||||
/* Open a connection to the remote board. */
|
||||
|
||||
static void
|
||||
common_open (struct target_ops *ops, char *name, int from_tty,
|
||||
common_open (struct target_ops *ops, const char *name, int from_tty,
|
||||
enum mips_monitor_type new_monitor,
|
||||
const char *new_monitor_prompt)
|
||||
{
|
||||
@ -1669,7 +1661,7 @@ seen from the board via TFTP, specify that name as the third parameter.\n"));
|
||||
/* Open a connection to an IDT board. */
|
||||
|
||||
static void
|
||||
mips_open (char *name, int from_tty)
|
||||
mips_open (const char *name, int from_tty)
|
||||
{
|
||||
const char *monitor_prompt = NULL;
|
||||
if (gdbarch_bfd_arch_info (target_gdbarch ()) != NULL
|
||||
@ -1694,7 +1686,7 @@ mips_open (char *name, int from_tty)
|
||||
/* Open a connection to a PMON board. */
|
||||
|
||||
static void
|
||||
pmon_open (char *name, int from_tty)
|
||||
pmon_open (const char *name, int from_tty)
|
||||
{
|
||||
common_open (&pmon_ops, name, from_tty, MON_PMON, "PMON> ");
|
||||
}
|
||||
@ -1702,7 +1694,7 @@ pmon_open (char *name, int from_tty)
|
||||
/* Open a connection to a DDB board. */
|
||||
|
||||
static void
|
||||
ddb_open (char *name, int from_tty)
|
||||
ddb_open (const char *name, int from_tty)
|
||||
{
|
||||
common_open (&ddb_ops, name, from_tty, MON_DDB, "NEC010>");
|
||||
}
|
||||
@ -1710,7 +1702,7 @@ ddb_open (char *name, int from_tty)
|
||||
/* Open a connection to a rockhopper board. */
|
||||
|
||||
static void
|
||||
rockhopper_open (char *name, int from_tty)
|
||||
rockhopper_open (const char *name, int from_tty)
|
||||
{
|
||||
common_open (&rockhopper_ops, name, from_tty, MON_ROCKHOPPER, "NEC01>");
|
||||
}
|
||||
@ -1718,7 +1710,7 @@ rockhopper_open (char *name, int from_tty)
|
||||
/* Open a connection to an LSI board. */
|
||||
|
||||
static void
|
||||
lsi_open (char *name, int from_tty)
|
||||
lsi_open (const char *name, int from_tty)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -667,7 +667,7 @@ gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
|
||||
/* Called when selecting the simulator. E.g. (gdb) target sim name. */
|
||||
|
||||
static void
|
||||
gdbsim_open (char *args, int from_tty)
|
||||
gdbsim_open (const char *args, int from_tty)
|
||||
{
|
||||
int len;
|
||||
char *arg_buf;
|
||||
|
13
gdb/remote.c
13
gdb/remote.c
@ -102,11 +102,8 @@ static void remote_files_info (struct target_ops *ignore);
|
||||
static void remote_prepare_to_store (struct target_ops *self,
|
||||
struct regcache *regcache);
|
||||
|
||||
static void remote_open (char *name, int from_tty);
|
||||
|
||||
static void extended_remote_open (char *name, int from_tty);
|
||||
|
||||
static void remote_open_1 (char *, int, struct target_ops *, int extended_p);
|
||||
static void remote_open_1 (const char *, int, struct target_ops *,
|
||||
int extended_p);
|
||||
|
||||
static void remote_close (struct target_ops *self);
|
||||
|
||||
@ -3619,7 +3616,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
|
||||
NAME is the filename used for communication. */
|
||||
|
||||
static void
|
||||
remote_open (char *name, int from_tty)
|
||||
remote_open (const char *name, int from_tty)
|
||||
{
|
||||
remote_open_1 (name, from_tty, &remote_ops, 0);
|
||||
}
|
||||
@ -3628,7 +3625,7 @@ remote_open (char *name, int from_tty)
|
||||
remote gdb protocol. NAME is the filename used for communication. */
|
||||
|
||||
static void
|
||||
extended_remote_open (char *name, int from_tty)
|
||||
extended_remote_open (const char *name, int from_tty)
|
||||
{
|
||||
remote_open_1 (name, from_tty, &extended_remote_ops, 1 /*extended_p */);
|
||||
}
|
||||
@ -4128,7 +4125,7 @@ remote_unpush_target (void)
|
||||
}
|
||||
|
||||
static void
|
||||
remote_open_1 (char *name, int from_tty,
|
||||
remote_open_1 (const char *name, int from_tty,
|
||||
struct target_ops *target, int extended_p)
|
||||
{
|
||||
struct remote_state *rs = get_remote_state ();
|
||||
|
@ -405,7 +405,7 @@ struct target_ops
|
||||
command, and (if successful) pushes a new target onto the
|
||||
stack. Targets should supply this routine, if only to provide
|
||||
an error message. */
|
||||
void (*to_open) (char *, int);
|
||||
void (*to_open) (const char *, int);
|
||||
/* Old targets with a static target vector provide "to_close".
|
||||
New re-entrant targets provide "to_xclose" and that is expected
|
||||
to xfree everything (including the "struct target_ops"). */
|
||||
|
@ -376,7 +376,7 @@ tfile_read (gdb_byte *readbuf, int size)
|
||||
}
|
||||
|
||||
static void
|
||||
tfile_open (char *filename, int from_tty)
|
||||
tfile_open (const char *arg, int from_tty)
|
||||
{
|
||||
volatile struct gdb_exception ex;
|
||||
char *temp;
|
||||
@ -390,12 +390,13 @@ tfile_open (char *filename, int from_tty)
|
||||
struct trace_status *ts;
|
||||
struct uploaded_tp *uploaded_tps = NULL;
|
||||
struct uploaded_tsv *uploaded_tsvs = NULL;
|
||||
char *filename;
|
||||
|
||||
target_preopen (from_tty);
|
||||
if (!filename)
|
||||
if (!arg)
|
||||
error (_("No trace file specified."));
|
||||
|
||||
filename = tilde_expand (filename);
|
||||
filename = tilde_expand (arg);
|
||||
if (!IS_ABSOLUTE_PATH(filename))
|
||||
{
|
||||
temp = concat (current_directory, "/", filename, (char *) NULL);
|
||||
|
Loading…
x
Reference in New Issue
Block a user