[PATCH 3/4] [gdb] Use make_scoped_restore in linespec_lexer_peek_token

[Tom de Vries <tdevries@suse.de>]

Use make_scoped_restore in linespec_lexer_peek_token to protect cleanups
against exceptions.
---
 gdb/linespec.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gdb/linespec.c b/gdb/linespec.c
index b6505ba283d..95ad0b048d2 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1037,20 +1037,16 @@ linespec_lexer_consume_token (linespec_parser *parser)
 static linespec_token
 linespec_lexer_peek_token (linespec_parser *parser)
 {
-  linespec_token next;
-  const char *saved_stream = parser->lexer.stream;
-  linespec_token saved_token = parser->lexer.current;
-  int saved_completion_quote_char = parser->completion_quote_char;
-  const char *saved_completion_quote_end = parser->completion_quote_end;
-  const char *saved_completion_word = parser->completion_word;
-
-  next = linespec_lexer_consume_token (parser);
-  parser->lexer.stream = saved_stream;
-  parser->lexer.current = saved_token;
-  parser->completion_quote_char = saved_completion_quote_char;
-  parser->completion_quote_end = saved_completion_quote_end;
-  parser->completion_word = saved_completion_word;
-  return next;
+  scoped_restore stream_restore = make_scoped_restore (&parser->lexer.stream);
+  scoped_restore token_restore = make_scoped_restore (&parser->lexer.current);
+  scoped_restore completion_quote_char_restore
+    = make_scoped_restore (&parser->completion_quote_char);
+  scoped_restore completion_quote_end_restore
+    = make_scoped_restore (&parser->completion_quote_end);
+  scoped_restore completion_word_restore
+    = make_scoped_restore (&parser->completion_word);
+
+  return linespec_lexer_consume_token (parser);
 }
 
 /* Helper functions.  */
-- 
2.51.0