remove redundant blank from strings (Re: Static tracepoints support)

Pedro Alves
2010-07-01T15:38:16Z

On Monday 28 June 2010 13:26:38, Pedro Alves wrote:
> >
> > > +If a line number is specified, probe the marker at start of code \n\
> > > +for that line. If a function is specified, probe the marker at start \n\
> >
> > The blank before "\n\" is redundant (here and elsewhere), its only
> > effect is to bloat the image of GDB.
>
> :-) Fixed the new instances.

And now applied this patch to fix all others.

--
Pedro Alves

2010-07-01 Pedro Alves <pedro@codesourcery.com>

* breakpoint.c (update_watchpoint, _initialize_breakpoint): Remove
unnecessary space in string.
* filesystem.c (_initialize_filesystem): Ditto.
* frame.c (_initialize_frame): Ditto.
* infcmd.c (step_once): Ditto.
* infrun.c (_initialize_infrun): Ditto.
* linux-nat.c (linux_child_follow_fork): Ditto.
* maint.c (maintenance_deprecate): Ditto.
* memattr.c (_initialize_mem): Ditto.
* mips-tdep.c (_initialize_mips_tdep): Ditto.
* monitor.c (monitor_open): Ditto.
* procfs.c (procfs_xfer_memory): Ditto.
* reverse.c (bookmarks_info): Ditto.
* sh64-tdep.c (sh64_show_media_regs, sh64_show_compact_regs): Ditto.
* stack.c (_initialize_stack): Ditto.
* tracepoint.c (_initialize_tracepoint): Ditto.
* xtensa-tdep.c (xtensa_supply_gregset,
xtensa_regset_from_core_section): Ditto.

---
gdb/breakpoint.c | 4 ++--
gdb/filesystem.c | 14 +++++++-------
gdb/frame.c | 2 +-
gdb/infcmd.c | 2 +-
gdb/infrun.c | 4 ++--
gdb/linux-nat.c | 2 +-
gdb/maint.c | 4 ++--
gdb/memattr.c | 6 +++---
gdb/mips-tdep.c | 2 +-
gdb/monitor.c | 2 +-
gdb/procfs.c | 6 +++---
gdb/reverse.c | 2 +-
gdb/sh64-tdep.c | 6 +++---
gdb/stack.c | 2 +-
gdb/tracepoint.c | 6 +++---
gdb/xtensa-tdep.c | 4 ++--
16 files changed, 34 insertions(+), 34 deletions(-)

Index: src/gdb/breakpoint.c
===================================================================
--- src.orig/gdb/breakpoint.c 2010-07-01 16:05:45.000000000 +0100
+++ src/gdb/breakpoint.c 2010-07-01 16:05:58.000000000 +0100
@@ -1584,7 +1584,7 @@ update_watchpoint (struct breakpoint *b,
else if (!within_current_scope)
{
printf_filtered (_("\
-Watchpoint %d deleted because the program has left the block \n\
+Watchpoint %d deleted because the program has left the block\n\
in which its expression is valid.\n"),
b->number);
if (b->related_breakpoint)
@@ -12002,7 +12002,7 @@ if TPNUM is omitted, passcount refers to

c = add_cmd ("breakpoints", class_breakpoint, save_breakpoints_command, _("\
Save current breakpoint definitions as a script.\n\
-This includes all types of breakpoints (breakpoints, watchpoints, \n\
+This includes all types of breakpoints (breakpoints, watchpoints,\n\
catchpoints, tracepoints). Use the 'source' command in another debug\n\
session to restore them."),
&save_cmdlist);
Index: src/gdb/filesystem.c
===================================================================
--- src.orig/gdb/filesystem.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/filesystem.c 2010-07-01 16:05:58.000000000 +0100
@@ -89,13 +89,13 @@ _initialize_filesystem (void)
Set assumed file system kind for target reported file names"), _("\
Show assumed file system kind for target reported file names"),
_("\
-If `unix', target file names (e.g., loaded shared library file names) \n\
-starting the forward slash (`/') character are considered absolute, \n\
-and the directory separator character is the forward slash (`/'). If \n\
-`dos-based', target file names starting with a drive letter followed \n\
-by a colon (e.g., `c:'), are also considered absolute, and the \n\
-backslash (`\\') is also considered a directory separator. Set to \n\
-`auto' (which is the default), to let GDB decide, based on its \n\
+If `unix', target file names (e.g., loaded shared library file names)\n\
+starting the forward slash (`/') character are considered absolute,\n\
+and the directory separator character is the forward slash (`/'). If\n\
+`dos-based', target file names starting with a drive letter followed\n\
+by a colon (e.g., `c:'), are also considered absolute, and the\n\
+backslash (`\\') is also considered a directory separator. Set to\n\
+`auto' (which is the default), to let GDB decide, based on its\n\
knowledge of the target operating system."),
NULL, /* setfunc */
show_target_file_system_kind_command,
Index: src/gdb/frame.c
===================================================================
--- src.orig/gdb/frame.c 2010-07-01 15:51:37.000000000 +0100
+++ src/gdb/frame.c 2010-07-01 16:05:58.000000000 +0100
@@ -2252,7 +2252,7 @@ Set whether backtraces should continue p
Show whether backtraces should continue past the entry point of a program."),
_("\
Normally there are no callers beyond the entry point of a program, so GDB\n\
-will terminate the backtrace there. Set this variable if you need to see \n\
+will terminate the backtrace there. Set this variable if you need to see\n\
the rest of the stack trace."),
NULL,
show_backtrace_past_entry,
Index: src/gdb/infcmd.c
===================================================================
--- src.orig/gdb/infcmd.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/infcmd.c 2010-07-01 16:05:58.000000000 +0100
@@ -1009,7 +1009,7 @@ step_once (int skip_subroutines, int sin

target_terminal_ours ();
printf_filtered (_("\
-Single stepping until exit from function %s, \n\
+Single stepping until exit from function %s,\n\
which has no line number information.\n"), name);
}
}
Index: src/gdb/infrun.c
===================================================================
--- src.orig/gdb/infrun.c 2010-07-01 15:51:37.000000000 +0100
+++ src/gdb/infrun.c 2010-07-01 16:05:58.000000000 +0100
@@ -6531,7 +6531,7 @@ from 1-15 are allowed for compatibility
Numeric ranges may be specified with the form LOW-HIGH (e.g. 1-5).\n\
The special arg \"all\" is recognized to mean all signals except those\n\
used by the debugger, typically SIGTRAP and SIGINT.\n\
-Recognized actions include \"s\" (toggles between stop and nostop), \n\
+Recognized actions include \"s\" (toggles between stop and nostop),\n\
\"r\" (toggles between print and noprint), \"i\" (toggles between pass and \
nopass), \"Q\" (noprint)\n\
Stop means reenter debugger if this signal happens (implies print).\n\
@@ -6665,7 +6665,7 @@ An exec call replaces the program image
\n\
follow-exec-mode can be:\n\
\n\
- new - the debugger creates a new inferior and rebinds the process \n\
+ new - the debugger creates a new inferior and rebinds the process\n\
to this new inferior. The program the process was running before\n\
the exec call can be restarted afterwards by restarting the original\n\
inferior.\n\
Index: src/gdb/linux-nat.c
===================================================================
--- src.orig/gdb/linux-nat.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/linux-nat.c 2010-07-01 16:05:58.000000000 +0100
@@ -679,7 +679,7 @@ linux_child_follow_fork (struct target_o
in the foreground, the user will not be able to ctrl-c to get
back the terminal, effectively hanging the debug session. */
fprintf_filtered (gdb_stderr, _("\
-Can not resume the parent process over vfork in the foreground while \n\
+Can not resume the parent process over vfork in the foreground while\n\
holding the child stopped. Try \"set detach-on-fork\" or \
\"set schedule-multiple\".\n"));
return 1;
Index: src/gdb/maint.c
===================================================================
--- src.orig/gdb/maint.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/maint.c 2010-07-01 16:05:58.000000000 +0100
@@ -536,8 +536,8 @@ maintenance_deprecate (char *args, int f
{
if (args == NULL || *args == '\0')
{
- printf_unfiltered (_("\"maintenance deprecate\" takes an argument, \n\
-the command you want to deprecate, and optionally the replacement command \n\
+ printf_unfiltered (_("\"maintenance deprecate\" takes an argument,\n\
+the command you want to deprecate, and optionally the replacement command\n\
enclosed in quotes.\n"));
}

Index: src/gdb/memattr.c
===================================================================
--- src.orig/gdb/memattr.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/memattr.c 2010-07-01 16:05:58.000000000 +0100
@@ -730,9 +730,9 @@ _initialize_mem (void)
Define attributes for memory region or reset memory region handling to\n\
target-based.\n\
Usage: mem auto\n\
- mem <lo addr> <hi addr> [<mode> <width> <cache>], \n\
-where <mode> may be rw (read/write), ro (read-only) or wo (write-only), \n\
- <width> may be 8, 16, 32, or 64, and \n\
+ mem <lo addr> <hi addr> [<mode> <width> <cache>],\n\
+where <mode> may be rw (read/write), ro (read-only) or wo (write-only),\n\
+ <width> may be 8, 16, 32, or 64, and\n\
<cache> may be cache or nocache"));

add_cmd ("mem", class_vars, mem_enable_command, _("\
Index: src/gdb/mips-tdep.c
===================================================================
--- src.orig/gdb/mips-tdep.c 2010-07-01 15:51:37.000000000 +0100
+++ src/gdb/mips-tdep.c 2010-07-01 16:05:58.000000000 +0100
@@ -6319,7 +6319,7 @@ search. The only need to set it is when
&mask_address_var, _("\
Set zeroing of upper 32 bits of 64-bit addresses."), _("\
Show zeroing of upper 32 bits of 64-bit addresses."), _("\
-Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to \n\
+Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to\n\
allow GDB to determine the correct value."),
NULL, show_mask_address,
&setmipscmdlist, &showmipscmdlist);
Index: src/gdb/monitor.c
===================================================================
--- src.orig/gdb/monitor.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/monitor.c 2010-07-01 16:05:58.000000000 +0100
@@ -721,7 +721,7 @@ monitor_open (char *args, struct monitor
name = targ_ops->to_shortname;

if (!args)
- error (_("Use `target %s DEVICE-NAME' to use a serial port, or \n\
+ error (_("Use `target %s DEVICE-NAME' to use a serial port, or\n\
`target %s HOST-NAME:PORT-NUMBER' to use a network connection."), name, name);

target_preopen (from_tty);
Index: src/gdb/procfs.c
===================================================================
--- src.orig/gdb/procfs.c 2010-07-01 15:51:37.000000000 +0100
+++ src/gdb/procfs.c 2010-07-01 16:05:58.000000000 +0100
@@ -4280,15 +4280,15 @@ procfs_xfer_memory (CORE_ADDR memaddr, g
if (dowrite)
{
#ifdef NEW_PROC_API
- PROCFS_NOTE ("write memory: ");
+ PROCFS_NOTE ("write memory:\n");
#else
- PROCFS_NOTE ("write memory: \n");
+ PROCFS_NOTE ("write memory:\n");
#endif
nbytes = write (pi->as_fd, myaddr, len);
}
else
{
- PROCFS_NOTE ("read memory: \n");
+ PROCFS_NOTE ("read memory:\n");
nbytes = read (pi->as_fd, myaddr, len);
}
if (nbytes < 0)
Index: src/gdb/reverse.c
===================================================================
--- src.orig/gdb/reverse.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/reverse.c 2010-07-01 16:05:58.000000000 +0100
@@ -306,7 +306,7 @@ bookmarks_info (char *args, int from_tty

gdbarch = get_regcache_arch (get_current_regcache ());
printf_filtered (_("Bookmark Address Opaque\n"));
- printf_filtered (_(" ID Data \n"));
+ printf_filtered (_(" ID Data\n"));

ALL_BOOKMARKS (b)
printf_filtered (" %d %s '%s'\n",
Index: src/gdb/sh64-tdep.c
===================================================================
--- src.orig/gdb/sh64-tdep.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/sh64-tdep.c 2010-07-01 16:05:58.000000000 +0100
@@ -1330,13 +1330,13 @@ sh64_show_media_regs (struct frame_info
int i;

printf_filtered
- ("PC=%s SR=%s \n",
+ ("PC=%s SR=%s\n",
phex (get_frame_register_unsigned (frame,
gdbarch_pc_regnum (gdbarch)), 8),
phex (get_frame_register_unsigned (frame, SR_REGNUM), 8));

printf_filtered
- ("SSR=%s SPC=%s \n",
+ ("SSR=%s SPC=%s\n",
phex (get_frame_register_unsigned (frame, SSR_REGNUM), 8),
phex (get_frame_register_unsigned (frame, SPC_REGNUM), 8));
printf_filtered
@@ -1383,7 +1383,7 @@ sh64_show_compact_regs (struct frame_inf
int i;

printf_filtered
- ("PC=%s \n",
+ ("PC=%s\n",
phex (get_frame_register_unsigned (frame, PC_C_REGNUM), 8));

printf_filtered
Index: src/gdb/stack.c
===================================================================
--- src.orig/gdb/stack.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/stack.c 2010-07-01 16:05:58.000000000 +0100
@@ -2210,7 +2210,7 @@ Use of the 'full' qualifier also prints
{
add_com_alias ("t", "backtrace", class_stack, 0);
add_com ("T", class_stack, backtrace_full_command, _("\
-Print backtrace of all stack frames, or innermost COUNT frames \n\
+Print backtrace of all stack frames, or innermost COUNT frames\n\
and the values of the local variables.\n\
With a negative argument, print outermost -COUNT frames.\n\
Usage: T <count>\n"));
Index: src/gdb/tracepoint.c
===================================================================
--- src.orig/gdb/tracepoint.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/tracepoint.c 2010-07-01 16:05:58.000000000 +0100
@@ -4452,7 +4452,7 @@ Usage: tfind range addr1,addr2"),

add_cmd ("line", class_trace, trace_find_line_command, _("\
Select a trace frame by source line.\n\
-Argument can be a line number (with optional source file), \n\
+Argument can be a line number (with optional source file),\n\
a function name, or '*' followed by an address.\n\
Default argument is 'the next source line that was traced'."),
&tfindlist);
@@ -4526,8 +4526,8 @@ Note: this command can only be used in a

add_com ("actions", class_trace, trace_actions_command, _("\
Specify the actions to be taken at a tracepoint.\n\
-Tracepoint actions may include collecting of specified data, \n\
-single-stepping, or enabling/disabling other tracepoints, \n\
+Tracepoint actions may include collecting of specified data,\n\
+single-stepping, or enabling/disabling other tracepoints,\n\
depending on target's capabilities."));

default_collect = xstrdup ("");
Index: src/gdb/xtensa-tdep.c
===================================================================
--- src.orig/gdb/xtensa-tdep.c 2010-07-01 15:51:36.000000000 +0100
+++ src/gdb/xtensa-tdep.c 2010-07-01 16:05:58.000000000 +0100
@@ -811,7 +811,7 @@ xtensa_supply_gregset (const struct regs
struct gdbarch *gdbarch = get_regcache_arch (rc);
int i;

- DEBUGTRACE ("xtensa_supply_gregset (..., regnum==%d, ...) \n", regnum);
+ DEBUGTRACE ("xtensa_supply_gregset (..., regnum==%d, ...)\n", regnum);

if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1)
regcache_raw_supply (rc, gdbarch_pc_regnum (gdbarch), (char *) &regs->pc);
@@ -869,7 +869,7 @@ xtensa_regset_from_core_section (struct
size_t sect_size)
{
DEBUGTRACE ("xtensa_regset_from_core_section "
- "(..., sect_name==\"%s\", sect_size==%x) \n",
+ "(..., sect_name==\"%s\", sect_size==%x)\n",
sect_name, (unsigned int) sect_size);

if (strcmp (sect_name, ".reg") == 0