public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH 08/14] Use scoped_restore in safe_parse_type
Date: Fri, 12 Aug 2022 18:54:36 -0600	[thread overview]
Message-ID: <20220813005442.4163512-9-tromey@adacore.com> (raw)
In-Reply-To: <20220813005442.4163512-1-tromey@adacore.com>

This changes safe_parse_type to use scoped_restore rather than
explicit assignments.
---
 gdb/gdbtypes.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8c2558dd7ac..c458b204157 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;
 }
 
-- 
2.34.1


  parent reply	other threads:[~2022-08-13  0:54 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-13  0:54 [PATCH 00/14] Minor ui / interp cleanups Tom Tromey
2022-08-13  0:54 ` [PATCH 01/14] Remove some dead code Tom Tromey
2022-08-13  0:54 ` [PATCH 02/14] Free ui::line_buffer Tom Tromey
2022-08-13  0:54 ` [PATCH 03/14] Use ui_out_redirect_pop in more places Tom Tromey
2022-08-13  0:54 ` [PATCH 04/14] Remove the "for moment" comments Tom Tromey
2022-08-13  0:54 ` [PATCH 05/14] Remove obsolete filtering comment Tom Tromey
2022-08-13  0:54 ` [PATCH 06/14] Remove two unused members from mi_interp Tom Tromey
2022-08-13  0:54 ` [PATCH 07/14] Use member initialization in 'struct ui' Tom Tromey
2022-08-13  0:54 ` Tom Tromey [this message]
2022-08-13  0:54 ` [PATCH 09/14] Remove tui_out_new Tom Tromey
2022-08-13  0:54 ` [PATCH 10/14] Remove a ui-related memory leak Tom Tromey
2022-08-13  0:54 ` [PATCH 11/14] TUI stdout buffering cleanup Tom Tromey
2022-08-13  0:54 ` [PATCH 12/14] Remove a call to clear_interpreter_hooks Tom Tromey
2022-08-13  0:54 ` [PATCH 13/14] Fix "source" with interpreter-exec Tom Tromey
2022-08-13  1:58   ` Enze Li
2022-08-15 17:28     ` Tom Tromey
2022-08-13  0:54 ` [PATCH 14/14] Fix interpreter-exec crash Tom Tromey
2022-08-31 17:13 ` [PATCH 00/14] Minor ui / interp cleanups Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220813005442.4163512-9-tromey@adacore.com \
    --to=tromey@adacore.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).