-Wpointer-sign: gdb_byte -> char.

This is sort of the opposite of the previous patch.  Places that
manipulate strings or interfaces that return strings are changed to
use char* instead of gdb_byte*.

gdb/
2013-04-19  Pedro Alves  <palves@redhat.com>

	* avr-tdep.c (avr_io_reg_read_command): New local 'bufstr'.  Use
	it to get a string view of the byte buffer.
	* i386-cygwin-tdep.c (core_process_module_section): Change local 'buf'
	type to gdb_byte *.  Adjust.
	* linux-tdep.c (linux_info_proc, linux_find_memory_regions_full):
	Change local to char *.
	* solib-darwin.c (find_program_interpreter): Change return type to
	char *.  Adjust.
	(darwin_solib_get_all_image_info_addr_at_init): Adjust.
	* solib-dsbt.c (enable_break2): Change local 'buf' to char *.
	* solib-frv.c (enable_break2): Change local 'buf' to char *.
	* solib-spu.c (spu_current_sos): Add gdb_byte * cast.
	* solib-svr4.c (find_program_interpreter): Change return type to
	char *.  Adjust.
	(enable_break): Change local 'interp_name' to char *.
	* spu-multiarch.c (spu_xfer_partial): Add cast to 'char *'.
	* spu-tdep.c (spu_pseudo_register_read_spu): Add cast to 'char *'.
	(spu_pseudo_register_write_spu): Use char for string buffer.
	Adjust.
	(info_spu_event_command, info_spu_signal_command): Add casts to
	'char *'.
This commit is contained in:
Pedro Alves 2013-04-19 15:10:53 +00:00
parent 948f8e3d72
commit 001f13d822
11 changed files with 53 additions and 25 deletions

View file

@ -1,3 +1,27 @@
2013-04-19 Pedro Alves <palves@redhat.com>
* avr-tdep.c (avr_io_reg_read_command): New local 'bufstr'. Use
it to get a string view of the byte buffer.
* i386-cygwin-tdep.c (core_process_module_section): Change local 'buf'
type to gdb_byte *. Adjust.
* linux-tdep.c (linux_info_proc, linux_find_memory_regions_full):
Change local to char *.
* solib-darwin.c (find_program_interpreter): Change return type to
char *. Adjust.
(darwin_solib_get_all_image_info_addr_at_init): Adjust.
* solib-dsbt.c (enable_break2): Change local 'buf' to char *.
* solib-frv.c (enable_break2): Change local 'buf' to char *.
* solib-spu.c (spu_current_sos): Add gdb_byte * cast.
* solib-svr4.c (find_program_interpreter): Change return type to
char *. Adjust.
(enable_break): Change local 'interp_name' to char *.
* spu-multiarch.c (spu_xfer_partial): Add cast to 'char *'.
* spu-tdep.c (spu_pseudo_register_read_spu): Add cast to 'char *'.
(spu_pseudo_register_write_spu): Use char for string buffer.
Adjust.
(info_spu_event_command, info_spu_signal_command): Add casts to
'char *'.
2013-04-19 Pedro Alves <palves@redhat.com> 2013-04-19 Pedro Alves <palves@redhat.com>
* aarch64-tdep.c (aarch64_default_breakpoint): Change type to * aarch64-tdep.c (aarch64_default_breakpoint): Change type to

View file

@ -1468,8 +1468,9 @@ avr_io_reg_read_command (char *args, int from_tty)
{ {
LONGEST bufsiz = 0; LONGEST bufsiz = 0;
gdb_byte *buf; gdb_byte *buf;
const char *bufstr;
char query[400]; char query[400];
char *p; const char *p;
unsigned int nreg = 0; unsigned int nreg = 0;
unsigned int val; unsigned int val;
int i, j, k, step; int i, j, k, step;
@ -1477,6 +1478,7 @@ avr_io_reg_read_command (char *args, int from_tty)
/* Find out how many io registers the target has. */ /* Find out how many io registers the target has. */
bufsiz = target_read_alloc (&current_target, TARGET_OBJECT_AVR, bufsiz = target_read_alloc (&current_target, TARGET_OBJECT_AVR,
"avr.io_reg", &buf); "avr.io_reg", &buf);
bufstr = (const char *) buf;
if (bufsiz <= 0) if (bufsiz <= 0)
{ {
@ -1486,7 +1488,7 @@ avr_io_reg_read_command (char *args, int from_tty)
return; return;
} }
if (sscanf (buf, "%x", &nreg) != 1) if (sscanf (bufstr, "%x", &nreg) != 1)
{ {
fprintf_unfiltered (gdb_stderr, fprintf_unfiltered (gdb_stderr,
_("Error fetching number of io registers\n")); _("Error fetching number of io registers\n"));
@ -1514,7 +1516,7 @@ avr_io_reg_read_command (char *args, int from_tty)
bufsiz = target_read_alloc (&current_target, TARGET_OBJECT_AVR, bufsiz = target_read_alloc (&current_target, TARGET_OBJECT_AVR,
query, &buf); query, &buf);
p = buf; p = (const char *) buf;
for (k = i; k < (i + j); k++) for (k = i; k < (i + j); k++)
{ {
if (sscanf (p, "%[^,],%x;", query, &val) == 2) if (sscanf (p, "%[^,],%x;", query, &val) == 2)

View file

@ -129,7 +129,7 @@ core_process_module_section (bfd *abfd, asection *sect, void *obj)
size_t module_name_size; size_t module_name_size;
CORE_ADDR base_addr; CORE_ADDR base_addr;
char *buf = NULL; gdb_byte *buf = NULL;
if (strncmp (sect->name, ".module", 7) != 0) if (strncmp (sect->name, ".module", 7) != 0)
return; return;
@ -154,9 +154,9 @@ core_process_module_section (bfd *abfd, asection *sect, void *obj)
module_name_size = module_name_size =
extract_unsigned_integer (buf + 8, 4, byte_order); extract_unsigned_integer (buf + 8, 4, byte_order);
module_name = buf + 12; if (12 + module_name_size > bfd_get_section_size (sect))
if (module_name - buf + module_name_size > bfd_get_section_size (sect))
goto out; goto out;
module_name = (char *) buf + 12;
/* The first module is the .exe itself. */ /* The first module is the .exe itself. */
if (data->module_count != 0) if (data->module_count != 0)

View file

@ -261,7 +261,7 @@ linux_info_proc (struct gdbarch *gdbarch, char *args,
int status_f = (what == IP_STATUS || what == IP_ALL); int status_f = (what == IP_STATUS || what == IP_ALL);
int stat_f = (what == IP_STAT || what == IP_ALL); int stat_f = (what == IP_STAT || what == IP_ALL);
char filename[100]; char filename[100];
gdb_byte *data; char *data;
int target_errno; int target_errno;
if (args && isdigit (args[0])) if (args && isdigit (args[0]))
@ -676,7 +676,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
void *obfd) void *obfd)
{ {
char mapsfilename[100]; char mapsfilename[100];
gdb_byte *data; char *data;
/* We need to know the real target PID to access /proc. */ /* We need to know the real target PID to access /proc. */
if (current_inferior ()->fake_pid_p) if (current_inferior ()->fake_pid_p)

View file

@ -210,10 +210,10 @@ lookup_symbol_from_bfd (bfd *abfd, char *symname)
/* Return program interpreter string. */ /* Return program interpreter string. */
static gdb_byte * static char *
find_program_interpreter (void) find_program_interpreter (void)
{ {
gdb_byte *buf = NULL; char *buf = NULL;
/* If we have an exec_bfd, get the interpreter from the load commands. */ /* If we have an exec_bfd, get the interpreter from the load commands. */
if (exec_bfd) if (exec_bfd)
@ -420,7 +420,7 @@ gdb_bfd_mach_o_fat_extract (bfd *abfd, bfd_format format,
static void static void
darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info) darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
{ {
gdb_byte *interp_name; char *interp_name;
CORE_ADDR load_addr = 0; CORE_ADDR load_addr = 0;
bfd *dyld_bfd = NULL; bfd *dyld_bfd = NULL;
struct cleanup *cleanup; struct cleanup *cleanup;

View file

@ -840,7 +840,7 @@ enable_break2 (void)
if (interp_sect) if (interp_sect)
{ {
unsigned int interp_sect_size; unsigned int interp_sect_size;
gdb_byte *buf; char *buf;
bfd *tmp_bfd = NULL; bfd *tmp_bfd = NULL;
CORE_ADDR addr; CORE_ADDR addr;
gdb_byte addr_buf[TIC6X_PTR_SIZE]; gdb_byte addr_buf[TIC6X_PTR_SIZE];

View file

@ -535,7 +535,7 @@ enable_break2 (void)
if (interp_sect) if (interp_sect)
{ {
unsigned int interp_sect_size; unsigned int interp_sect_size;
gdb_byte *buf; char *buf;
bfd *tmp_bfd = NULL; bfd *tmp_bfd = NULL;
int status; int status;
CORE_ADDR addr, interp_loadmap_addr; CORE_ADDR addr, interp_loadmap_addr;

View file

@ -209,7 +209,7 @@ spu_current_sos (void)
yet. Skip such entries; we'll be back for them later. */ yet. Skip such entries; we'll be back for them later. */
xsnprintf (annex, sizeof annex, "%d/object-id", fd); xsnprintf (annex, sizeof annex, "%d/object-id", fd);
len = target_read (&current_target, TARGET_OBJECT_SPU, annex, len = target_read (&current_target, TARGET_OBJECT_SPU, annex,
id, 0, sizeof id); (gdb_byte *) id, 0, sizeof id);
if (len <= 0 || len >= sizeof id) if (len <= 0 || len >= sizeof id)
continue; continue;
id[len] = 0; id[len] = 0;

View file

@ -496,7 +496,7 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size)
/* Return program interpreter string. */ /* Return program interpreter string. */
static gdb_byte * static char *
find_program_interpreter (void) find_program_interpreter (void)
{ {
gdb_byte *buf = NULL; gdb_byte *buf = NULL;
@ -521,7 +521,7 @@ find_program_interpreter (void)
if (!buf) if (!buf)
buf = read_program_header (PT_INTERP, NULL, NULL); buf = read_program_header (PT_INTERP, NULL, NULL);
return buf; return (char *) buf;
} }
@ -1446,7 +1446,7 @@ enable_break (struct svr4_info *info, int from_tty)
struct minimal_symbol *msymbol; struct minimal_symbol *msymbol;
const char * const *bkpt_namep; const char * const *bkpt_namep;
asection *interp_sect; asection *interp_sect;
gdb_byte *interp_name; char *interp_name;
CORE_ADDR sym_addr; CORE_ADDR sym_addr;
info->interp_text_sect_low = info->interp_text_sect_high = 0; info->interp_text_sect_low = info->interp_text_sect_high = 0;

View file

@ -285,7 +285,7 @@ spu_xfer_partial (struct target_ops *ops, enum target_object object,
0, sizeof buf) <= 0) 0, sizeof buf) <= 0)
return ret; return ret;
lslr = strtoulst (buf, NULL, 16); lslr = strtoulst ((char *) buf, NULL, 16);
return ops_beneath->to_xfer_partial (ops_beneath, TARGET_OBJECT_SPU, return ops_beneath->to_xfer_partial (ops_beneath, TARGET_OBJECT_SPU,
mem_annex, readbuf, writebuf, mem_annex, readbuf, writebuf,
addr & lslr, len); addr & lslr, len);

View file

@ -192,6 +192,7 @@ spu_pseudo_register_read_spu (struct regcache *regcache, const char *regname,
gdb_byte reg[32]; gdb_byte reg[32];
char annex[32]; char annex[32];
ULONGEST id; ULONGEST id;
ULONGEST ul;
status = regcache_raw_read_unsigned (regcache, SPU_ID_REGNUM, &id); status = regcache_raw_read_unsigned (regcache, SPU_ID_REGNUM, &id);
if (status != REG_VALID) if (status != REG_VALID)
@ -201,7 +202,8 @@ spu_pseudo_register_read_spu (struct regcache *regcache, const char *regname,
target_read (&current_target, TARGET_OBJECT_SPU, annex, target_read (&current_target, TARGET_OBJECT_SPU, annex,
reg, 0, sizeof reg); reg, 0, sizeof reg);
store_unsigned_integer (buf, 4, byte_order, strtoulst (reg, NULL, 16)); ul = strtoulst ((char *) reg, NULL, 16);
store_unsigned_integer (buf, 4, byte_order, ul);
return REG_VALID; return REG_VALID;
} }
@ -254,7 +256,7 @@ spu_pseudo_register_write_spu (struct regcache *regcache, const char *regname,
{ {
struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch *gdbarch = get_regcache_arch (regcache);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte reg[32]; char reg[32];
char annex[32]; char annex[32];
ULONGEST id; ULONGEST id;
@ -263,7 +265,7 @@ spu_pseudo_register_write_spu (struct regcache *regcache, const char *regname,
xsnprintf (reg, sizeof reg, "0x%s", xsnprintf (reg, sizeof reg, "0x%s",
phex_nz (extract_unsigned_integer (buf, 4, byte_order), 4)); phex_nz (extract_unsigned_integer (buf, 4, byte_order), 4));
target_write (&current_target, TARGET_OBJECT_SPU, annex, target_write (&current_target, TARGET_OBJECT_SPU, annex,
reg, 0, strlen (reg)); (gdb_byte *) reg, 0, strlen (reg));
} }
static void static void
@ -2045,7 +2047,7 @@ info_spu_event_command (char *args, int from_tty)
if (len <= 0) if (len <= 0)
error (_("Could not read event_status.")); error (_("Could not read event_status."));
buf[len] = '\0'; buf[len] = '\0';
event_status = strtoulst (buf, NULL, 16); event_status = strtoulst ((char *) buf, NULL, 16);
xsnprintf (annex, sizeof annex, "%d/event_mask", id); xsnprintf (annex, sizeof annex, "%d/event_mask", id);
len = target_read (&current_target, TARGET_OBJECT_SPU, annex, len = target_read (&current_target, TARGET_OBJECT_SPU, annex,
@ -2053,7 +2055,7 @@ info_spu_event_command (char *args, int from_tty)
if (len <= 0) if (len <= 0)
error (_("Could not read event_mask.")); error (_("Could not read event_mask."));
buf[len] = '\0'; buf[len] = '\0';
event_mask = strtoulst (buf, NULL, 16); event_mask = strtoulst ((char *) buf, NULL, 16);
chain = make_cleanup_ui_out_tuple_begin_end (current_uiout, "SPUInfoEvent"); chain = make_cleanup_ui_out_tuple_begin_end (current_uiout, "SPUInfoEvent");
@ -2112,7 +2114,7 @@ info_spu_signal_command (char *args, int from_tty)
if (len <= 0) if (len <= 0)
error (_("Could not read signal1_type.")); error (_("Could not read signal1_type."));
buf[len] = '\0'; buf[len] = '\0';
signal1_type = strtoulst (buf, NULL, 16); signal1_type = strtoulst ((char *) buf, NULL, 16);
xsnprintf (annex, sizeof annex, "%d/signal2", id); xsnprintf (annex, sizeof annex, "%d/signal2", id);
len = target_read (&current_target, TARGET_OBJECT_SPU, annex, buf, 0, 4); len = target_read (&current_target, TARGET_OBJECT_SPU, annex, buf, 0, 4);
@ -2130,7 +2132,7 @@ info_spu_signal_command (char *args, int from_tty)
if (len <= 0) if (len <= 0)
error (_("Could not read signal2_type.")); error (_("Could not read signal2_type."));
buf[len] = '\0'; buf[len] = '\0';
signal2_type = strtoulst (buf, NULL, 16); signal2_type = strtoulst ((char *) buf, NULL, 16);
chain = make_cleanup_ui_out_tuple_begin_end (current_uiout, "SPUInfoSignal"); chain = make_cleanup_ui_out_tuple_begin_end (current_uiout, "SPUInfoSignal");