diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-01-26 21:54:45 +0000 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-01-26 21:54:45 +0000 |
commit | 4c63965b8a74d9dd3d8ed6fed659c4db977c6ddd (patch) | |
tree | 64cf919895461ab530db6372abd54e58e0250428 /gdb/cli/cli-cmds.c | |
parent | 88f38a04788e0a788dbc3159c87d4c96c867f681 (diff) | |
download | gdb-4c63965b8a74d9dd3d8ed6fed659c4db977c6ddd.zip gdb-4c63965b8a74d9dd3d8ed6fed659c4db977c6ddd.tar.gz gdb-4c63965b8a74d9dd3d8ed6fed659c4db977c6ddd.tar.bz2 |
gdb/
Do not open script filenames twice.
* cli/cli-cmds.c (source_script_from_stream): Pass to
source_python_script also STREAM.
* python/py-auto-load.c (source_section_scripts): Pass to
source_python_script_for_objfile also STREAM.
(auto_load_objfile_script): Pass to source_python_script_for_objfile
also INPUT.
* python/python-internal.h (source_python_script_for_objfile): New
parameter file, rename parameter file to filename.
* python/python.c (python_run_simple_file): Call PyRun_SimpleFile
instead if !_WIN32. Update the function comment.
(source_python_script, source_python_script_for_objfile)
(source_python_script): New parameter file, rename parameter file to
filename. Pass FILENAME to python_run_simple_file.
* python/python.h (source_python_script): New parameter file, rename
parameter file to filename.
Diffstat (limited to 'gdb/cli/cli-cmds.c')
-rw-r--r-- | gdb/cli/cli-cmds.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 15b6b79..9c118e1 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -539,9 +539,7 @@ source_script_from_stream (FILE *stream, const char *file) TRY_CATCH (e, RETURN_MASK_ERROR) { - /* The python support reopens the file using python functions, - so there's no point in passing STREAM here. */ - source_python_script (file); + source_python_script (stream, file); } if (e.reason < 0) { |