FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/

Browse source 
Code cleanup.
	* python/py-auto-load.c (source_section_scripts): New variable back_to.
	Turn fclose and xfree calls into make_cleanup_fclose and make_cleanup
	with xfree.
	(auto_load_objfile_script): Turn fclose into make_cleanup_fclose.
This commit is contained in:
Jan Kratochvil 2012-03-19 18:23:52 +00:00
parent 8320cc4fa3
commit e97a38f76e
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2012-03-19 Jan Kratochvil <jan.kratochvil@redhat.com>
Code cleanup.
* python/py-auto-load.c (source_section_scripts): New variable back_to.
Turn fclose and xfree calls into make_cleanup_fclose and make_cleanup
with xfree.
(auto_load_objfile_script): Turn fclose into make_cleanup_fclose.
2012-03-19 Jan Kratochvil <jan.kratochvil@redhat.com> 2012-03-19 Jan Kratochvil <jan.kratochvil@redhat.com>
* NEWS: Describe new options --init-command=FILE, -ix and * NEWS: Describe new options --init-command=FILE, -ix and

15
gdb/python/py-auto-load.c
View file

@ -254,6 +254,7 @@ source_section_scripts (struct objfile *objfile, const char *source_name,
FILE *stream; FILE *stream;
char *full_path; char *full_path;
int opened, in_hash_table; int opened, in_hash_table;
struct cleanup *back_to;
if (*p != 1) if (*p != 1)
{ {
@ -286,6 +287,13 @@ source_section_scripts (struct objfile *objfile, const char *source_name,
opened = find_and_open_script (file, 1 /*search_path*/, opened = find_and_open_script (file, 1 /*search_path*/,
&stream, &full_path); &stream, &full_path);
back_to = make_cleanup (null_cleanup, NULL);
if (opened)
{
make_cleanup_fclose (stream);
make_cleanup (xfree, full_path);
}
/* If one script isn't found it's not uncommon for more to not be /* If one script isn't found it's not uncommon for more to not be
found either. We don't want to print an error message for each found either. We don't want to print an error message for each
script, too much noise. Instead, we print the warning once and tell script, too much noise. Instead, we print the warning once and tell
@ -313,9 +321,9 @@ Use `info auto-load-scripts [REGEXP]' to list them."),
/* If this file is not currently loaded, load it. */ /* If this file is not currently loaded, load it. */
if (! in_hash_table) if (! in_hash_table)
source_python_script_for_objfile (objfile, stream, full_path); source_python_script_for_objfile (objfile, stream, full_path);
fclose (stream);
xfree (full_path);
} }
do_cleanups (back_to);
} }
} }
@ -420,6 +428,8 @@ auto_load_objfile_script (struct objfile *objfile, const char *suffix)
{ {
struct auto_load_pspace_info *pspace_info; struct auto_load_pspace_info *pspace_info;
make_cleanup_fclose (input);
/* Add this script to the hash table too so "info auto-load-scripts" /* Add this script to the hash table too so "info auto-load-scripts"
can print it. */ can print it. */
pspace_info = pspace_info =
@ -432,7 +442,6 @@ auto_load_objfile_script (struct objfile *objfile, const char *suffix)
and these scripts are required to be idempotent under multiple and these scripts are required to be idempotent under multiple
loads anyway. */ loads anyway. */
source_python_script_for_objfile (objfile, input, debugfile); source_python_script_for_objfile (objfile, input, debugfile);
fclose (input);
} }
do_cleanups (cleanups); do_cleanups (cleanups);