gdb/guile: Have gdbscm_safe_source_script return a unique_ptr

Change gdbscm_safe_source_script to return a
gdb::unique_xmalloc_ptr<char> instead of a raw char*.  Update the
users of this function.

There should be no user visible change after this commit.

gdb/ChangeLog:

	* guile/guile-internal.h (gdbscm_safe_source_script): Change
	function return type.
	* guile/guile.c (gdbscm_source_script): Update to handle change in
	gdbscm_safe_source_script.
	* guile/scm-objfile.c (gdbscm_source_objfile_script): Likewise.
	* guile/scm-safe-call.c (gdbscm_safe_source_script): Change return
	type.
This commit is contained in:
Andrew Burgess
2021-05-05 21:39:06 +01:00
parent 4896932e62
commit 9589edb836
5 changed files with 18 additions and 15 deletions

View File

@ -1,3 +1,13 @@
2021-05-07 Andrew Burgess <andrew.burgess@embecosm.com>
* guile/guile-internal.h (gdbscm_safe_source_script): Change
function return type.
* guile/guile.c (gdbscm_source_script): Update to handle change in
gdbscm_safe_source_script.
* guile/scm-objfile.c (gdbscm_source_objfile_script): Likewise.
* guile/scm-safe-call.c (gdbscm_safe_source_script): Change return
type.
2021-05-06 Simon Marchi <simon.marchi@polymtl.ca>
* inferior.h (class inferior) <args>: Change type to

View File

@ -408,7 +408,8 @@ extern SCM gdbscm_unsafe_call_1 (SCM proc, SCM arg0);
extern gdb::unique_xmalloc_ptr<char> gdbscm_safe_eval_string
(const char *string, int display_result);
extern char *gdbscm_safe_source_script (const char *filename);
extern gdb::unique_xmalloc_ptr<char> gdbscm_safe_source_script
(const char *filename);
extern void gdbscm_enter_repl (void);

View File

@ -270,13 +270,10 @@ static void
gdbscm_source_script (const struct extension_language_defn *extlang,
FILE *file, const char *filename)
{
char *msg = gdbscm_safe_source_script (filename);
gdb::unique_xmalloc_ptr<char> msg = gdbscm_safe_source_script (filename);
if (msg != NULL)
{
fprintf_filtered (gdb_stderr, "%s\n", msg);
xfree (msg);
}
fprintf_filtered (gdb_stderr, "%s\n", msg.get ());
}
/* (execute string [#:from-tty boolean] [#:to-string boolean])

View File

@ -310,16 +310,11 @@ gdbscm_source_objfile_script (const struct extension_language_defn *extlang,
struct objfile *objfile, FILE *file,
const char *filename)
{
char *msg;
ofscm_current_objfile = objfile;
msg = gdbscm_safe_source_script (filename);
gdb::unique_xmalloc_ptr<char> msg = gdbscm_safe_source_script (filename);
if (msg != NULL)
{
fprintf_filtered (gdb_stderr, "%s", msg);
xfree (msg);
}
fprintf_filtered (gdb_stderr, "%s", msg.get ());
ofscm_current_objfile = NULL;
}

View File

@ -431,7 +431,7 @@ scscm_source_scheme_script (void *data)
printed according to "set guile print-stack" and the result is an error
message allocated with malloc, caller must free. */
char *
gdb::unique_xmalloc_ptr<char>
gdbscm_safe_source_script (const char *filename)
{
/* scm_c_primitive_load_path only looks in %load-path for files with
@ -452,7 +452,7 @@ gdbscm_safe_source_script (const char *filename)
(void *) filename);
if (result != NULL)
return xstrdup (result);
return make_unique_xstrdup (result);
return NULL;
}