[PATCH 4/9] Return a const reference from gdbpy_get_print_options

[Tom Tromey <tom@tromey.com>]

This changes gdbpy_get_print_options to return a const reference to
the relevant value_print_options.
---
 gdb/python/py-prettyprint.c  | 11 +++++------
 gdb/python/py-value.c        |  7 ++-----
 gdb/python/python-internal.h |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index 1326aaae476..a89bf073215 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -718,8 +718,7 @@ gdbpy_print_options (PyObject *unused1, PyObject *unused2)
   if (result == nullptr)
     return nullptr;
 
-  value_print_options opts;
-  gdbpy_get_print_options (&opts);
+  const value_print_options &opts = gdbpy_get_print_options ();
 
   if (set_boolean (result.get (), "raw",
 		   opts.raw) < 0
@@ -770,13 +769,13 @@ gdbpy_print_options (PyObject *unused1, PyObject *unused2)
 
 /* Helper function that either finds the prevailing print options, or
    calls get_user_print_options.  */
-void
-gdbpy_get_print_options (value_print_options *opts)
+const value_print_options &
+gdbpy_get_print_options ()
 {
   if (gdbpy_current_print_options != nullptr)
-    *opts = *gdbpy_current_print_options;
+    return *gdbpy_current_print_options;
   else
-    *opts = get_user_print_options ();
+    return get_user_print_options ();
 }
 
 /* A ValuePrinter is just a "tag", so it has no state other than that
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 5b38110396e..a63af395e2c 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -690,8 +690,7 @@ valpy_format_string (PyObject *self, PyObject *args, PyObject *kw)
       return NULL;
     }
 
-  struct value_print_options opts;
-  gdbpy_get_print_options (&opts);
+  value_print_options opts = gdbpy_get_print_options ();
   opts.deref_ref = false;
 
   /* We need objects for booleans as the "p" flag for bools is new in
@@ -1248,9 +1247,7 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords)
 static PyObject *
 valpy_str (PyObject *self)
 {
-  struct value_print_options opts;
-
-  gdbpy_get_print_options (&opts);
+  value_print_options opts = gdbpy_get_print_options ();
   opts.deref_ref = false;
 
   string_file stb;
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 4ca28bb6957..f9899740a5f 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -974,7 +974,7 @@ gdb::unique_xmalloc_ptr<char> gdbpy_get_display_hint (PyObject *printer);
 PyObject *gdbpy_default_visualizer (PyObject *self, PyObject *args);
 
 PyObject *gdbpy_print_options (PyObject *self, PyObject *args);
-void gdbpy_get_print_options (value_print_options *opts);
+const value_print_options &gdbpy_get_print_options ();
 extern const struct value_print_options *gdbpy_current_print_options;
 
 void bpfinishpy_pre_stop_hook (struct gdbpy_breakpoint_object *bp_obj);

-- 
2.49.0