commit c3d4b6a6d9f382d7b88c2d25a1520acc1c3d51bd
author Tom Tromey <tromey@adacore.com> Thu Aug 11 11:59:06 2022 -0600
committer Tom Tromey <tromey@adacore.com> Wed Aug 31 11:03:40 2022 -0600
tree 0f56e84f5dbb87b72112e6753a63671d1306ea60
parent d9f95811860d9b99d539deb80bc6f48f0cee10e8

Use scoped_restore in safe_parse_type

This changes safe_parse_type to use scoped_restore rather than
explicit assignments.

gdb/gdbtypes.c

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8c2558d..c458b20 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3168,12 +3168,11 @@ check_typedef (struct type *type)
 static struct type *
 safe_parse_type (struct gdbarch *gdbarch, const char *p, int length)
 {
-  struct ui_file *saved_gdb_stderr;
   struct type *type = NULL; /* Initialize to keep gcc happy.  */
 
   /* Suppress error messages.  */
-  saved_gdb_stderr = gdb_stderr;
-  gdb_stderr = &null_stream;
+  scoped_restore saved_gdb_stderr = make_scoped_restore (&gdb_stderr,
+							 &null_stream);
 
   /* Call parse_and_eval_type() without fear of longjmp()s.  */
   try
@@ -3185,9 +3184,6 @@ safe_parse_type (struct gdbarch *gdbarch, const char *p, int length)
       type = builtin_type (gdbarch)->builtin_void;
     }
 
-  /* Stop suppressing error messages.  */
-  gdb_stderr = saved_gdb_stderr;
-
   return type;
 }