From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0MWGFav29mKv9CUAWB0awg (envelope-from ) for ; Fri, 12 Aug 2022 20:56:11 -0400 Received: by simark.ca (Postfix, from userid 112) id 563A51E5EA; Fri, 12 Aug 2022 20:56:11 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=gAMcmshT; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EB5051E227 for ; Fri, 12 Aug 2022 20:56:10 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C9703857B88 for ; Sat, 13 Aug 2022 00:56:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C9703857B88 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1660352170; bh=rLJ4AGcYQqpt9ng0XU7/gvaiOg/LSQLXNGPck6qBjl4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gAMcmshTzxEnf1UAUL0JpDDPNJZoX+GSLNvuoC7oRMCt3HsJXsvRsbLGzVXnAMmmG AR4RDOXHyxkOUxTDWXdj07yaihIWAG4dDkbnbxsmWdiCIGk+c44OEiRWT99/O07rDp 9jFwyGdTZX5ULHGq9gklbRQM8S1JWTIZxwyMXE2U= Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id 416DA3858400 for ; Sat, 13 Aug 2022 00:54:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 416DA3858400 Received: by mail-io1-xd2c.google.com with SMTP id i84so2070634ioa.6 for ; Fri, 12 Aug 2022 17:54:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=rLJ4AGcYQqpt9ng0XU7/gvaiOg/LSQLXNGPck6qBjl4=; b=05fB3NlXnxM11MZUPjZfBaa0jS1yFrBGw0J+zD1xN4Tbj02PJIhS8xlMCTdlt+eahj CbLrGVrLaj5NWeNR1i1GuFlslCdZXH90H2P77wpGQCvP6yXenaSBC3cD/gbuVdNf3uPK d+80Ob1/4Kq0BGtalRspR9NejhzU93GHJRRa72DrrdLPew7ryQuGeI/7cd8O+VwCIsjM sbzkIltyoZb5DzG7hGHeqOy/eFSf5TpHwFoojfRSGcMycyBlX5DWbz4teTt538amc68i FIGwHqOd9cE4bTka3CJ2oyxafrvZK7/Q0pGwf2dftQFVe7ZOxdBhKV+nP89nenjlXyZT O2lg== X-Gm-Message-State: ACgBeo1drgJefA3BK6ug/HEBiyTYrcGZASKEUjmPrlGxViPmmZAjMDvC sA/FF5Zxj+PmW7zWHteZHAwCYTzF0m5Enw== X-Google-Smtp-Source: AA6agR7LXnd47qUvMMA8kTgKhBd1fWb50SbgUR6BB71aUeagXhyw683obCaemnmptAmu9MDLd4z6qQ== X-Received: by 2002:a05:6602:14d:b0:67b:9536:680f with SMTP id v13-20020a056602014d00b0067b9536680fmr2607309iot.202.1660352089968; Fri, 12 Aug 2022 17:54:49 -0700 (PDT) Received: from murgatroyd.Home (71-211-185-228.hlrn.qwest.net. [71.211.185.228]) by smtp.gmail.com with ESMTPSA id p17-20020a056638217100b00343455007f7sm494366jak.110.2022.08.12.17.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:54:49 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCH 08/14] Use scoped_restore in safe_parse_type Date: Fri, 12 Aug 2022 18:54:36 -0600 Message-Id: <20220813005442.4163512-9-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220813005442.4163512-1-tromey@adacore.com> References: <20220813005442.4163512-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom Tromey via Gdb-patches Reply-To: Tom Tromey Cc: Tom Tromey Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" 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