[dump] small source cleanup

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01760.html
	* dumpfile.c (dump_begin): Reorder decls to use RAII.

From-SVN: r277415

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 977b592817f8ad9ff30c57626db96de808071f3a..fb00aa65b794c1dcc7df7810939c4d392c1ee740 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Nathan Sidwell  <nathan@acm.org>
+
+       * dumpfile.c (dump_begin): Reorder decls to use RAII.
+
 2019-10-24  Martin Liska  <mliska@suse.cz>
 
        * symbol-summary.h (gt_pch_nx): Mark all functions

diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 5263d3a213474b12bf09027be0252da1547f9f51..7ea8f85c9bda2974dd442f08c5820f16776e9c58 100644 (file)
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -1532,21 +1532,17 @@ FILE *
 gcc::dump_manager::
 dump_begin (int phase, dump_flags_t *flag_ptr, int part)
 {
-  char *name;
-  struct dump_file_info *dfi;
-  FILE *stream;
-
   if (phase == TDI_none || !dump_phase_enabled_p (phase))
     return NULL;
 
-  name = get_dump_file_name (phase, part);
+  char *name = get_dump_file_name (phase, part);
   if (!name)
     return NULL;
-  dfi = get_dump_file_info (phase);
+  struct dump_file_info *dfi = get_dump_file_info (phase);
 
   /* We do not support re-opening of dump files with parts.  This would require
      tracking pstate per part of the dump file.  */
-  stream = dump_open (name, part != -1 || dfi->pstate < 0);
+  FILE *stream = dump_open (name, part != -1 || dfi->pstate < 0);
   if (stream)
     dfi->pstate = 1;
   free (name);