Factor out flags printing code from generic_val_print

gdb/ChangeLog:

	* valprint.c (generic_val_print): Factor out flags
	printing code to ...
	(generic_val_print_flags): ... this new function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e16a24eb8ae8e503b2815238a0330b8021b02c9e..4c6e17c7d1bf39efdcb6957c4211f179e2142943 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-27  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * valprint.c (generic_val_print): Factor out flags
+       printing code to ...
+       (generic_val_print_flags): ... this new function.
+
 2015-07-27  Simon Marchi  <simon.marchi@ericsson.com>
 
        * valprint.c (generic_val_print): Factor out enum

diff --git a/gdb/valprint.c b/gdb/valprint.c
index f9d603a18963e393e9ba50b3740733dae04304e0..d05b9075c8c61e05cf103a3f09e9c890d351cd04 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -578,6 +578,22 @@ generic_val_print_enum (struct type *type, const gdb_byte *valaddr,
     print_longest (stream, 'd', 0, val);
 }
 
+/* generic_val_print helper for TYPE_CODE_FLAGS.  */
+
+static void
+generic_val_print_flags (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)
+    val_print_scalar_formatted (type, valaddr, embedded_offset, original_value,
+                               options, 0, stream);
+  else
+    val_print_type_code_flags (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
@@ -630,12 +646,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
       break;
 
     case TYPE_CODE_FLAGS:
-      if (options->format)
-       val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                   original_value, options, 0, stream);
-      else
-       val_print_type_code_flags (type, valaddr + embedded_offset,
-                                  stream);
+      generic_val_print_flags (type, valaddr, embedded_offset, stream,
+                              original_value, options);
       break;
 
     case TYPE_CODE_FUNC: