[PATCH 10/14] Factor out int printing code from generic_val_print

Simon Marchi
2015-07-15T16:48:02Z

* valprint.c (generic_val_print): Factor out integer
printing code to ...
(generic_val_print_int): ... this new function.
---
gdb/valprint.c | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/gdb/valprint.c b/gdb/valprint.c
index 7b90971..3d1480c2 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -654,6 +654,27 @@ generic_val_print_bool (struct type *type, const gdb_byte *valaddr,
}
}

+/* generic_val_print helper for TYPE_CODE_INT. */
+
+static void
+generic_val_print_int (struct type *type, const gdb_byte *valaddr,
+ int embedded_offset, struct ui_file *stream,
+ const struct value *original_value,
+ const struct value_print_options *options)
+{
+ if (options->format || options->output_format)
+ {
+ struct value_print_options opts = *options;
+
+ opts.format = (options->format ? options->format
+ : options->output_format);
+ val_print_scalar_formatted (type, valaddr, embedded_offset,
+ original_value, &opts, 0, stream);
+ }
+ else
+ val_print_type_code_int (type, valaddr + embedded_offset, stream);
+}
+
/* A generic val_print that is suitable for use by language
implementations of the la_val_print method. This function can
handle most type codes, though not all, notably exception
@@ -732,17 +753,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
/* FALLTHROUGH */

case TYPE_CODE_INT:
- if (options->format || options->output_format)
- {
- struct value_print_options opts = *options;
-
- opts.format = (options->format ? options->format
- : options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, &opts, 0, stream);
- }
- else
- val_print_type_code_int (type, valaddr + embedded_offset, stream);
+ generic_val_print_int (type, valaddr, embedded_offset, stream,
+ original_value, options);
break;

case TYPE_CODE_CHAR:
--
2.1.4