espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 14:49:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate remaining gdb/guile cleanups

Browse Source 
The remaining gdb/guile cleanups all handle the memory returned by
gdbscm_scm_to_c_string.

This commit makes gdbscm_scm_to_c_string return a
gdb::unique_xmalloc_ptr instead of a naked pointer, and eliminates the
remaining cleanups.

gdb/ChangeLog:
2018-07-19  Pedro Alves  <palves@redhat.com>

	* guile/guile-internal.h (gdbscm_scm_to_c_string): Now returns a
	gdb::unique_xmalloc_ptr.
	* guile/scm-breakpoint.c (gdbscm_set_breakpoint_condition_x):
	Adjust to use dbscm_wrap and gdb::unique_xmalloc_ptr.
	* guile/scm-exception.c (gdbscm_exception_message_to_string): Use
	copy-initialization.
	* guile/scm-pretty-print.c (ppscm_print_children): Use
	gdb::unique_xmalloc_ptr instead of cleanups.
	(gdbscm_apply_val_pretty_printer): Remove cleanups.
	* guile/scm-string.c (gdbscm_scm_to_c_string): Now returns a
	gdb::unique_xmalloc_ptr.
	* guile/scm-type.c (gdbscm_type_field, gdbscm_type_has_field_p):
	Adjust to use gdb::unique_xmalloc_ptr.
	* guile/scm-utils.c (extract_arg): Adjust.
	* guile/scm-value.c (gdbscm_value_field): Adjust to use
	gdb::unique_xmalloc_ptr instead of a cleanup.
This commit is contained in:
Pedro Alves
2018-07-19 16:34:55 +01:00
parent 4581dc8297
commit 4c6933327e
9 changed files with 62 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gdb/guile/scm-pretty-print.c
View File

@ -734,7 +734,6 @@ ppscm_print_children (SCM printer, enum display_hint hint,
unsigned int i;
SCM children;
SCM iter = SCM_BOOL_F; /* -Wall */
struct cleanup *cleanups;
if (gdbscm_is_false (w_smob->children))
return;
@ -746,8 +745,6 @@ ppscm_print_children (SCM printer, enum display_hint hint,
return;
}
cleanups = make_cleanup (null_cleanup, NULL);
/* If we are printing a map or an array, we want special formatting. */
is_map = hint == HINT_MAP;
is_array = hint == HINT_ARRAY;
@ -788,9 +785,7 @@ ppscm_print_children (SCM printer, enum display_hint hint,
for (i = 0; i < options->print_max; ++i)
{
SCM scm_name, v_scm;
char *name;
SCM item = itscm_safe_call_next_x (iter, gdbscm_memory_error_p);
struct cleanup *inner_cleanup = make_cleanup (null_cleanup, NULL);
if (gdbscm_is_exception (item))
{
@ -822,8 +817,8 @@ ppscm_print_children (SCM printer, enum display_hint hint,
" a string"), item);
continue;
}
name = gdbscm_scm_to_c_string (scm_name);
make_cleanup (xfree, name);
gdb::unique_xmalloc_ptr<char> name
= gdbscm_scm_to_c_string (scm_name);
/* Print initial "{". For other elements, there are three cases:
1. Maps. Print a "," after each value element.
@ -874,7 +869,7 @@ ppscm_print_children (SCM printer, enum display_hint hint,
}
else if (! is_map)
{
fputs_filtered (name, stream);
fputs_filtered (name.get (), stream);
fputs_filtered (" = ", stream);
}
@ -887,10 +882,9 @@ ppscm_print_children (SCM printer, enum display_hint hint,
}
else if (scm_is_string (v_scm))
{
char *output = gdbscm_scm_to_c_string (v_scm);
fputs_filtered (output, stream);
xfree (output);
gdb::unique_xmalloc_ptr<char> output
= gdbscm_scm_to_c_string (v_scm);
fputs_filtered (output.get (), stream);
}
else
{
@ -910,8 +904,6 @@ ppscm_print_children (SCM printer, enum display_hint hint,
if (is_map && i % 2 == 0)
fputs_filtered ("] = ", stream);
do_cleanups (inner_cleanup);
}
if (i)
@ -934,8 +926,6 @@ ppscm_print_children (SCM printer, enum display_hint hint,
}
done:
do_cleanups (cleanups);
/* Play it safe, make sure ITER doesn't get GC'd. */
scm_remember_upto_here_1 (iter);
}
@ -957,7 +947,6 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang,
SCM val_obj = SCM_BOOL_F;
struct value *value;
enum display_hint hint;
struct cleanup *cleanups;
enum ext_lang_rc result = EXT_LANG_RC_NOP;
enum string_repr_result print_result;
const gdb_byte *valaddr = value_contents_for_printing (val);
@ -969,8 +958,6 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang,
if (!gdb_scheme_initialized)
return EXT_LANG_RC_NOP;
cleanups = make_cleanup (null_cleanup, NULL);
/* Instantiate the printer. */
value = value_from_component (val, type, embedded_offset);
@ -1024,7 +1011,6 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang,
done:
if (gdbscm_is_exception (exception))
ppscm_print_exception_unless_memory_error (exception, stream);
do_cleanups (cleanups);
return result;
}