gdb: Remove a non-const reference parameter

[deliverable/binutils-gdb.git] / gdb / python / py-framefilter.c

diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index deb4a8f1c8b9352b53db526b539a1b1145a8ccd6..a351ac5aec879c5d1995ef62598067dffee0ba3f 100644 (file)
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -30,7 +30,7 @@
 #include "demangle.h"
 #include "mi/mi-cmds.h"
 #include "python-internal.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 enum mi_print_types
 {
@@ -481,7 +481,8 @@ enumerate_args (PyObject *iter,
              return EXT_LANG_BT_ERROR;
            }
 
-         read_frame_arg (sym, frame, &arg, &entryarg);
+         read_frame_arg (user_frame_print_options,
+                         sym, frame, &arg, &entryarg);
 
          gdb::unique_xmalloc_ptr<char> arg_holder (arg.error);
          gdb::unique_xmalloc_ptr<char> entry_holder (entryarg.error);
@@ -1085,7 +1086,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
     {
       gdbarch = get_frame_arch (frame);
     }
-  catch (const gdb_exception_RETURN_MASK_ERROR &except)
+  catch (const gdb_exception_error &except)
     {
       /* Let gdb try to print the stack trace.  */
       return EXT_LANG_BT_NO_FILTERS;
@@ -1170,7 +1171,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
          success = py_print_frame (item.get (), flags, args_type, out, 0,
                                    levels_printed.get ());
        }
-      catch (const gdb_exception_RETURN_MASK_ERROR &except)
+      catch (const gdb_exception_error &except)
        {
          gdbpy_convert_exception (except);
          success = EXT_LANG_BT_ERROR;