This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
For careful review: Some gcc -Wformat fixes ....
- To: gdb-patches@sourceware.cygnus.com
- Subject: For careful review: Some gcc -Wformat fixes ....
- From: Andrew Cagney <ac131313@cygnus.com>
- Date: Sat, 28 Aug 1999 14:55:25 +1000
- DJ-Gateway: from newsgroup cygnus.patches.gdb
- Newsgroups: cygnus.patches.gdb
- Organization: Cygnus Solutions
(Yes I've got more of these pending)
Could maintainers please look over the following patch to see if I've
got any of the changes wrong.
Andrew
Sat Aug 28 14:23:29 1999 Andrew Cagney <cagney@b1.cygnus.com>
* scm-valprint.c (scm_ipruk), jv-valprint.c (java_value_print),
cp-valprint.c (cp_print_class_member), exec.c (exec_files_info),
remote.c (putpkt_binary, compare_sections_command,
remote_cisco_section_offsets), dcache.c (dcache_info),
breakpoint.c (break_at_finish_at_depth_command_1,
break_at_finish_command_1), symfile.c (generic_load),
(report_transfer_performance), top.c (get_prompt_1),
f-valprint.c
(f_val_print), maint.c (maintenance_translate_address): Fix
printf
-Wformat warnings. Use paddr, paddr_nz, sizeof_paddr, paddr_u
and
paddr_d to print addresses. Change ``d'' to ``ld''.
* utils.c (strlen_paddr): New function.
Index: breakpoint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/breakpoint.c,v
retrieving revision 1.238
diff -p -r1.238 breakpoint.c
*** breakpoint.c 1999/08/26 00:09:22 1.238
--- breakpoint.c 1999/08/28 04:49:03
*************** break_at_finish_at_depth_command_1 (arg,
*** 4494,4502 ****
{
addr_string = (char *) xmalloc (26 + extra_args_len);
if (extra_args_len)
! sprintf (addr_string, "*0x%x %s", high, extra_args);
else
! sprintf (addr_string, "*0x%x", high);
break_command_1 (addr_string, flag, from_tty);
free (addr_string);
}
--- 4494,4502 ----
{
addr_string = (char *) xmalloc (26 + extra_args_len);
if (extra_args_len)
! sprintf (addr_string, "*0x%s %s", paddr_nz (high), extra_args);
else
! sprintf (addr_string, "*0x%s", paddr_nz (high));
break_command_1 (addr_string, flag, from_tty);
free (addr_string);
}
*************** break_at_finish_command_1 (arg, flag, fr
*** 4531,4537 ****
if (selected_frame)
{
addr_string = (char *) xmalloc (15);
! sprintf (addr_string, "*0x%x", selected_frame->pc);
if (arg)
if_arg = 1;
}
--- 4531,4537 ----
if (selected_frame)
{
addr_string = (char *) xmalloc (15);
! sprintf (addr_string, "*0x%s", paddr_nz (selected_frame->pc));
if (arg)
if_arg = 1;
}
*************** break_at_finish_command_1 (arg, flag, fr
*** 4579,4587 ****
{
break_string = (char *) xmalloc (extra_args_len + 26);
if (extra_args_len)
! sprintf (break_string, "*0x%x %s", high, extra_args);
else
! sprintf (break_string, "*0x%x", high);
break_command_1 (break_string, flag, from_tty);
free (break_string);
}
--- 4579,4587 ----
{
break_string = (char *) xmalloc (extra_args_len + 26);
if (extra_args_len)
! sprintf (break_string, "*0x%s %s", paddr_nz (high), extra_args);
else
! sprintf (break_string, "*0x%s", paddr_nz (high));
break_command_1 (break_string, flag, from_tty);
free (break_string);
}
Index: cp-valprint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/cp-valprint.c,v
retrieving revision 2.42
diff -p -r2.42 cp-valprint.c
*** cp-valprint.c 1999/07/07 23:51:04 2.42
--- cp-valprint.c 1999/08/28 04:49:05
*************** cp_print_class_member (valaddr, domain,
*** 726,732 ****
fprintf_filtered (stream, " (offset in bits)");
}
else
! fprintf_filtered (stream, "%d", val >> 3);
}
--- 726,732 ----
fprintf_filtered (stream, " (offset in bits)");
}
else
! fprintf_filtered (stream, "%ld", (long) (val >> 3));
}
Index: dcache.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/dcache.c,v
retrieving revision 2.23
diff -p -r2.23 dcache.c
*** dcache.c 1999/07/07 23:51:05 2.23
--- dcache.c 1999/08/28 04:49:07
*************** dcache_info (exp, tty)
*** 525,532 ****
for (p = last_cache->valid_head; p; p = p->p)
{
int j;
! printf_filtered ("Line at %08xd, referenced %d times\n",
! p->addr, p->refs);
for (j = 0; j < LINE_SIZE; j++)
printf_filtered ("%02x", p->data[j] & 0xFF);
--- 525,532 ----
for (p = last_cache->valid_head; p; p = p->p)
{
int j;
! printf_filtered ("Line at %s, referenced %d times\n",
! paddr (p->addr), p->refs);
for (j = 0; j < LINE_SIZE; j++)
printf_filtered ("%02x", p->data[j] & 0xFF);
Index: exec.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/exec.c,v
retrieving revision 1.83
diff -p -r1.83 exec.c
*** exec.c 1999/07/07 23:51:06 1.83
--- exec.c 1999/08/28 04:49:07
*************** exec_files_info (t)
*** 618,630 ****
struct vmap *vp;
printf_unfiltered ("\tMapping info for file `%s'.\n", vmap->name);
! printf_unfiltered ("\t %8.8s %8.8s %8.8s %8.8s %8.8s %s\n",
! "tstart", "tend", "dstart", "dend", "section",
"file(member)");
for (vp = vmap; vp; vp = vp->nxt)
! printf_unfiltered ("\t0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x %s%s%s%s\n",
! vp->tstart, vp->tend, vp->dstart, vp->dend, vp->name,
*vp->member ? "(" : "", vp->member,
*vp->member ? ")" : "");
}
--- 618,638 ----
struct vmap *vp;
printf_unfiltered ("\tMapping info for file `%s'.\n", vmap->name);
! printf_unfiltered ("\t %*s %*s %*s %*s %8.8s %s\n",
! strlen_paddr (), "tstart",
! strlen_paddr (), "tend",
! strlen_paddr (), "dstart",
! strlen_paddr (), "dend",
! "section",
"file(member)");
for (vp = vmap; vp; vp = vp->nxt)
! printf_unfiltered ("\t0x%s 0x%s 0x%s 0x%s %s%s%s%s\n",
! paddr (vp->tstart),
! paddr (vp->tend),
! paddr (vp->dstart),
! paddr (vp->dend),
! vp->name,
*vp->member ? "(" : "", vp->member,
*vp->member ? ")" : "");
}
Index: f-valprint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/f-valprint.c,v
retrieving revision 2.18
diff -p -r2.18 f-valprint.c
*** f-valprint.c 1999/07/07 23:51:07 2.18
--- f-valprint.c 1999/08/28 04:49:09
*************** f_val_print (type, valaddr, embedded_off
*** 431,437 ****
}
if (addressprint && format != 's')
! fprintf_filtered (stream, "0x%x", addr);
/* For a pointer to char or unsigned char, also print the string
pointed to, unless pointer is null. */
--- 431,437 ----
}
if (addressprint && format != 's')
! fprintf_filtered (stream, "0x%s", paddr_nz (addr));
/* For a pointer to char or unsigned char, also print the string
pointed to, unless pointer is null. */
Index: jv-valprint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/jv-valprint.c,v
retrieving revision 2.13
diff -p -r2.13 jv-valprint.c
*** jv-valprint.c 1999/07/07 23:51:38 2.13
--- jv-valprint.c 1999/08/28 04:49:09
*************** java_value_print (val, stream, format, p
*** 126,132 ****
if (element == 0)
fprintf_filtered (stream, "null");
else
! fprintf_filtered (stream, "@%x", element);
things_printed++;
i += reps;
--- 126,132 ----
if (element == 0)
fprintf_filtered (stream, "null");
else
! fprintf_filtered (stream, "@%s", paddr_nz (element));
things_printed++;
i += reps;
Index: maint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/maint.c,v
retrieving revision 2.32
diff -p -r2.32 maint.c
*** maint.c 1999/08/13 21:41:26 2.32
--- maint.c 1999/08/28 04:49:12
*************** maintenance_translate_address (arg, from
*** 351,363 ****
sym = lookup_minimal_symbol_by_pc (address);
if (sym)
! printf_filtered ("%s+%u\n",
SYMBOL_SOURCE_NAME (sym),
! address - SYMBOL_VALUE_ADDRESS (sym));
else if (sect)
! printf_filtered ("no symbol at %s:0x%08x\n", sect->name, address);
else
! printf_filtered ("no symbol at 0x%08x\n", address);
return;
}
--- 351,363 ----
sym = lookup_minimal_symbol_by_pc (address);
if (sym)
! printf_filtered ("%s+%s\n",
SYMBOL_SOURCE_NAME (sym),
! paddr_u (address - SYMBOL_VALUE_ADDRESS (sym)));
else if (sect)
! printf_filtered ("no symbol at %s:0x%s\n", sect->name, paddr (address));
else
! printf_filtered ("no symbol at 0x%s\n", paddr (address));
return;
}
Index: remote.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/remote.c,v
retrieving revision 1.218
diff -p -r1.218 remote.c
*** remote.c 1999/08/25 08:56:52 1.218
--- remote.c 1999/08/28 04:49:21
*************** remote_cisco_section_offsets (text_addr,
*** 1592,1599 ****
sprintf_vma (tmp + strlen (tmp), bss_addr);
fprintf_filtered (gdb_stdlog, tmp);
fprintf_filtered (gdb_stdlog,
! "Reloc offset: text = 0x%x data = 0x%x bss = 0x%x\n",
! (long) *text_offs, (long) *data_offs, (long) *bss_offs);
}
return 0;
--- 1592,1601 ----
sprintf_vma (tmp + strlen (tmp), bss_addr);
fprintf_filtered (gdb_stdlog, tmp);
fprintf_filtered (gdb_stdlog,
! "Reloc offset: text = 0x%s data = 0x%s bss = 0x%s\n",
! paddr_nz (*text_offs),
! paddr_nz (*data_offs),
! paddr_nz (*bss_offs));
}
return 0;
*************** putpkt_binary (buf, cnt)
*** 3453,3459 ****
*p = '\0';
fprintf_unfiltered (gdb_stdlog, "Sending packet: ");
fputstrn_unfiltered (buf2, p - buf2, 0, gdb_stdlog);
! fprintf_unfiltered (gdb_stdlog, "...", buf2);
gdb_flush (gdb_stdlog);
}
if (SERIAL_WRITE (remote_desc, buf2, p - buf2))
--- 3455,3461 ----
*p = '\0';
fprintf_unfiltered (gdb_stdlog, "Sending packet: ");
fputstrn_unfiltered (buf2, p - buf2, 0, gdb_stdlog);
! fprintf_unfiltered (gdb_stdlog, "...");
gdb_flush (gdb_stdlog);
}
if (SERIAL_WRITE (remote_desc, buf2, p - buf2))
*************** compare_sections_command (args, from_tty
*** 4258,4265 ****
for (target_crc = 0, tmp = &buf[1]; *tmp; tmp++)
target_crc = target_crc * 16 + fromhex (*tmp);
! printf_filtered ("Section %s, range 0x%08x -- 0x%08x: ",
! sectname, lma, lma + size);
if (host_crc == target_crc)
printf_filtered ("matched.\n");
else
--- 4260,4267 ----
for (target_crc = 0, tmp = &buf[1]; *tmp; tmp++)
target_crc = target_crc * 16 + fromhex (*tmp);
! printf_filtered ("Section %s, range 0x%s -- 0x%s: ",
! sectname, paddr (lma), paddr (lma + size));
if (host_crc == target_crc)
printf_filtered ("matched.\n");
else
Index: scm-valprint.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/scm-valprint.c,v
retrieving revision 2.6
diff -p -r2.6 scm-valprint.c
*** scm-valprint.c 1999/07/07 23:52:04 2.6
--- scm-valprint.c 1999/08/28 04:49:23
*************** scm_ipruk (hdr, ptr, stream)
*** 145,151 ****
if (SCM_CELLP (ptr))
fprintf_filtered (stream, " (0x%lx . 0x%lx) @",
(long) SCM_CAR (ptr), (long) SCM_CDR (ptr));
! fprintf_filtered (stream, " 0x%x>", ptr);
}
void
--- 145,151 ----
if (SCM_CELLP (ptr))
fprintf_filtered (stream, " (0x%lx . 0x%lx) @",
(long) SCM_CAR (ptr), (long) SCM_CDR (ptr));
! fprintf_filtered (stream, " 0x%s>", paddr_nz (ptr));
}
void
*************** taloop:
*** 217,223 ****
(sizet) LENGTH (name),
port);
#endif
! fprintf_filtered (stream, " #X%lX>", svalue);
break;
}
case scm_tcs_cons_imcar:
--- 217,223 ----
(sizet) LENGTH (name),
port);
#endif
! fprintf_filtered (stream, " #X%s>", paddr_nz (svalue));
break;
}
case scm_tcs_cons_imcar:
Index: symfile.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/symfile.c,v
retrieving revision 1.192
diff -p -r1.192 symfile.c
*** symfile.c 1999/08/16 21:34:48 1.192
--- symfile.c 1999/08/28 04:49:30
*************** generic_load (filename, from_tty)
*** 1196,1202 ****
{
unsigned long entry;
entry = bfd_get_start_address (loadfile_bfd);
! printf_filtered ("Start address 0x%lx , load size %d\n", entry, data_count);
/* We were doing this in remote-mips.c, I suspect it is right
for other targets too. */
write_pc (entry);
--- 1196,1202 ----
{
unsigned long entry;
entry = bfd_get_start_address (loadfile_bfd);
! printf_filtered ("Start address 0x%lx , load size %ld\n", entry, data_count);
/* We were doing this in remote-mips.c, I suspect it is right
for other targets too. */
write_pc (entry);
*************** report_transfer_performance (data_count,
*** 1222,1231 ****
{
printf_filtered ("Transfer rate: ");
if (end_time != start_time)
! printf_filtered ("%d bits/sec",
(data_count * 8) / (end_time - start_time));
else
! printf_filtered ("%d bits in <1 sec", (data_count * 8));
printf_filtered (".\n");
}
--- 1222,1231 ----
{
printf_filtered ("Transfer rate: ");
if (end_time != start_time)
! printf_filtered ("%ld bits/sec",
(data_count * 8) / (end_time - start_time));
else
! printf_filtered ("%ld bits in <1 sec", (data_count * 8));
printf_filtered (".\n");
}
Index: top.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/top.c,v
retrieving revision 2.154
diff -p -r2.154 top.c
*** top.c 1999/08/24 21:38:50 2.154
--- top.c 1999/08/28 04:49:39
*************** get_prompt_1 (formatted_prompt)
*** 3395,3401 ****
else
{
if (available >= 16 /*? */ ) /* overflow protect */
! sprintf (outp, "%d", (long) longval);
}
break;
}
--- 3395,3401 ----
else
{
if (available >= 16 /*? */ ) /* overflow protect */
! sprintf (outp, "%ld", (long) longval);
}
break;
}
Index: utils.c
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/utils.c,v
retrieving revision 1.200
diff -p -r1.200 utils.c
*** utils.c 1999/08/27 10:53:41 1.200
--- utils.c 1999/08/28 04:49:43
*************** get_cell ()
*** 3111,3116 ****
--- 3111,3123 ----
*/
+ int
+ strlen_paddr (void)
+ {
+ return (TARGET_PTR_BIT / 8 * 2);
+ }
+
+
/* eliminate warning from compiler on 32-bit systems */
static int thirty_two = 32;