Remove newlines from warnings

ARI pointed out that a recent patch introduced a call to "warning"
with a string that ended in a newline:

    https://sourceware.org/ml/gdb-patches/2019-06/msg00000.html

This is generally forbidden, I believe, because warning adds its own
newline.

This patch removes all of the trailing newlines I was able to find.  I
searched for 'warning (.*\\n"' and then fixed the ones where the
newline appeared at the end of the string (some had internal
newlines).

Tested on x86-64 Fedora 29.

gdb/ChangeLog
2019-06-10  Tom Tromey  <tromey@adacore.com>

	* m32c-tdep.c (m32c_m16c_address_to_pointer): Don't end warning
	with a newline.
	* guile/guile.c (handle_boot_error): Don't end warning with a
	newline.
	* cli/cli-cmds.c (exit_status_set_internal_vars): Don't end
	warning with a newline.
	* s12z-tdep.c (s12z_skip_prologue): Don't end warning with a
	newline.
	(s12z_frame_cache): Likewise.
	* dwarf-index-cache.c (index_cache::store): Don't end warning with
	a newline.
	* solib-svr4.c (disable_probes_interface): Don't end warning with
	a newline.
	* nat/fork-inferior.c (fork_inferior): Don't end warning with a
	newline.
	* python/python.c (do_finish_initialization): Don't end warning
	with a newline.

gdb/gdbserver/ChangeLog
2019-06-10  Tom Tromey  <tromey@adacore.com>

	* remote-utils.c (look_up_one_symbol, relocate_instruction): Don't
	end warning with a newline.
	* linux-s390-low.c (s390_get_wordsize): Don't end warning with a
	newline.
	* thread-db.c (attach_thread): Don't end warning with a newline.
	(thread_db_notice_clone): Likewise.
	* tracepoint.c (gdb_agent_helper_thread): Don't end warning with a
	newline.
	* linux-x86-low.c (x86_get_min_fast_tracepoint_insn_len): Don't
	end warning with a newline.
This commit is contained in:
Tom Tromey 2019-06-03 08:07:29 -06:00
parent 58e07198f3
commit 422186a95c
15 changed files with 52 additions and 19 deletions

View File

@ -1,3 +1,23 @@
2019-06-10 Tom Tromey <tromey@adacore.com>
* m32c-tdep.c (m32c_m16c_address_to_pointer): Don't end warning
with a newline.
* guile/guile.c (handle_boot_error): Don't end warning with a
newline.
* cli/cli-cmds.c (exit_status_set_internal_vars): Don't end
warning with a newline.
* s12z-tdep.c (s12z_skip_prologue): Don't end warning with a
newline.
(s12z_frame_cache): Likewise.
* dwarf-index-cache.c (index_cache::store): Don't end warning with
a newline.
* solib-svr4.c (disable_probes_interface): Don't end warning with
a newline.
* nat/fork-inferior.c (fork_inferior): Don't end warning with a
newline.
* python/python.c (do_finish_initialization): Don't end warning
with a newline.
2019-06-10 Tom Tromey <tom@tromey.com>
* python/py-breakpoint.c (gdbpy_breakpoint_created)

View File

@ -686,7 +686,7 @@ exit_status_set_internal_vars (int exit_status)
else if (WIFSIGNALED (exit_status))
set_internalvar_integer (var_signal, WTERMSIG (exit_status));
else
warning (_("unexpected shell command exit status %d\n"), exit_status);
warning (_("unexpected shell command exit status %d"), exit_status);
}
static void

View File

@ -115,7 +115,7 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
/* Try to create the containing directory. */
if (!mkdir_recursive (m_dir.c_str ()))
{
warning (_("index cache: could not make cache directory: %s\n"),
warning (_("index cache: could not make cache directory: %s"),
safe_strerror (errno));
return;
}

View File

@ -1,3 +1,16 @@
2019-06-10 Tom Tromey <tromey@adacore.com>
* remote-utils.c (look_up_one_symbol, relocate_instruction): Don't
end warning with a newline.
* linux-s390-low.c (s390_get_wordsize): Don't end warning with a
newline.
* thread-db.c (attach_thread): Don't end warning with a newline.
(thread_db_notice_clone): Likewise.
* tracepoint.c (gdb_agent_helper_thread): Don't end warning with a
newline.
* linux-x86-low.c (x86_get_min_fast_tracepoint_insn_len): Don't
end warning with a newline.
2019-06-04 Pedro Alves <palves@redhat.com>
* server.c (captured_main): Use make_unique_xstrdup.

View File

@ -479,7 +479,7 @@ s390_get_wordsize (int pid)
(PTRACE_TYPE_ARG4) 0);
if (errno != 0)
{
warning (_("Couldn't determine word size, assuming 64-bit.\n"));
warning (_("Couldn't determine word size, assuming 64-bit."));
return 8;
}
/* Derive word size from extended addressing mode (PSW bit 31). */

View File

@ -1481,7 +1481,7 @@ x86_get_min_fast_tracepoint_insn_len (void)
mention that something has gone awry. */
if (!warned_about_fast_tracepoints)
{
warning ("4-byte fast tracepoints not available; %s\n", errbuf);
warning ("4-byte fast tracepoints not available; %s", errbuf);
warned_about_fast_tracepoints = 1;
}
return 5;

View File

@ -1558,7 +1558,7 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb)
if (!startswith (cs.own_buf, "qSymbol:"))
{
warning ("Malformed response to qSymbol, ignoring: %s\n", cs.own_buf);
warning ("Malformed response to qSymbol, ignoring: %s", cs.own_buf);
return -1;
}
@ -1659,14 +1659,14 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc)
if (cs.own_buf[0] == 'E')
{
warning ("An error occurred while relocating an instruction: %s\n",
warning ("An error occurred while relocating an instruction: %s",
cs.own_buf);
return -1;
}
if (!startswith (cs.own_buf, "qRelocInsn:"))
{
warning ("Malformed response to qRelocInsn, ignoring: %s\n",
warning ("Malformed response to qRelocInsn, ignoring: %s",
cs.own_buf);
return -1;
}

View File

@ -227,7 +227,7 @@ attach_thread (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p)
{
std::string reason = linux_ptrace_attach_fail_reason_string (ptid, err);
warning ("Could not attach to thread %ld (LWP %d): %s\n",
warning ("Could not attach to thread %ld (LWP %d): %s",
(unsigned long) ti_p->ti_tid, ti_p->ti_lid, reason.c_str ());
return 0;
@ -907,5 +907,5 @@ thread_db_notice_clone (struct thread_info *parent_thr, ptid_t child_ptid)
= make_scoped_restore (&current_thread, parent_thr);
if (!find_one_thread (child_ptid))
warning ("Cannot find thread after clone.\n");
warning ("Cannot find thread after clone.");
}

View File

@ -7194,7 +7194,7 @@ gdb_agent_helper_thread (void *arg)
if (listen_fd == -1)
{
warning ("could not create sync socket\n");
warning ("could not create sync socket");
break;
}
@ -7218,7 +7218,7 @@ gdb_agent_helper_thread (void *arg)
if (fd < 0)
{
warning ("Accept returned %d, error: %s\n",
warning ("Accept returned %d, error: %s",
fd, strerror (errno));
break;
}

View File

@ -568,7 +568,7 @@ handle_boot_error (void *boot_scm_file, SCM key, SCM args)
warning (_("Could not complete Guile gdb module initialization from:\n"
"%s.\n"
"Limited Guile support is available.\n"
"Suggest passing --data-directory=/path/to/gdb/data-directory.\n"),
"Suggest passing --data-directory=/path/to/gdb/data-directory."),
(const char *) boot_scm_file);
return SCM_UNSPECIFIED;

View File

@ -2452,7 +2452,7 @@ m32c_m16c_address_to_pointer (struct gdbarch *gdbarch,
"couldn't find trampoline named '%s.plt'.\n"
"Returning pointer value %s instead; this may produce\n"
"a useful result if converted back into an address by GDB,\n"
"but will most likely not be useful otherwise.\n"),
"but will most likely not be useful otherwise."),
paddress (gdbarch, addr), func_name,
paddress (gdbarch, ptrval));

View File

@ -425,7 +425,7 @@ fork_inferior (const char *exec_file_arg, const std::string &allargs,
for (i = 1; argv[i] != NULL; i++)
warning (" %s", argv[i]);
warning ("Error: %s\n", safe_strerror (save_errno));
warning ("Error: %s", safe_strerror (save_errno));
_exit (0177);
}

View File

@ -1876,7 +1876,7 @@ do_finish_initialization (const struct extension_language_defn *extlang)
warning (_("\n"
"Could not load the Python gdb module from `%s'.\n"
"Limited Python support is available from the _gdb module.\n"
"Suggest passing --data-directory=/path/to/gdb/data-directory.\n"),
"Suggest passing --data-directory=/path/to/gdb/data-directory."),
gdb_pythondir.c_str ());
/* We return "success" here as we've already emitted the
warning. */

View File

@ -90,8 +90,8 @@ s12z_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
return prologue_end;
}
warning (_("%s Failed to find end of prologue PC = %08x\n"),
__FUNCTION__, (unsigned int) pc);
warning (_("%s Failed to find end of prologue PC = %08x"),
__FUNCTION__, (unsigned int) pc);
return pc;
}
@ -296,7 +296,7 @@ s12z_frame_cache (struct frame_info *this_frame, void **prologue_cache)
/* Return early if GDB couldn't find the function. */
if (start_addr == 0)
{
warning (_("Couldn't find function including address %s SP is %s\n"),
warning (_("Couldn't find function including address %s SP is %s"),
paddress (gdbarch, this_pc),
paddress (gdbarch, this_sp));

View File

@ -1858,7 +1858,7 @@ static void
disable_probes_interface (svr4_info *info)
{
warning (_("Probes-based dynamic linker interface failed.\n"
"Reverting to original interface.\n"));
"Reverting to original interface."));
free_probes_table (info);
free_solib_list (info);