forked from Imagelibrary/binutils-gdb
* cli/cli-script.c (do_fclose_cleanup): Remove.
(script_from_file): Use make_cleanup_fclose. * xml-tdesc.c (do_cleanup_fclose): Remove. (fetch_xml_from_file): Use make_cleanup_fclose. * tracepoint.c (tracepoint_save_command): Use make_cleanup_fclose. Always free pathname. * source.c (print_source_lines_base): Use make_cleanup_fclose. * remote.c (fclose_cleanup): Remove. (remote_file_put): Use make_cleanup_fclose. (remote_file_get): Likewise. * linux-nat.c (linux_nat_find_memory_regions): Use make_cleanup_fclose. (linux_nat_info_proc_cmd): Likewise. (linux_proc_pending_signals): Likewise. * fbsd-nat.c (fbsd_find_memory_regions): Use make_cleanup_fclose. Free file name. * cli/cli-dump.c (do_fclose_cleanup): Remove. (make_cleanup_fclose): Remove. * defs.h (make_cleanup_fclose): Declare. * utils.c (do_fclose_cleanup): New function. (make_cleanup_fclose): Likewise.
This commit is contained in:
@@ -1312,6 +1312,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
|
||||
int desc;
|
||||
FILE *stream;
|
||||
int nlines = stopline - line;
|
||||
struct cleanup *cleanup;
|
||||
|
||||
/* Regardless of whether we can open the file, set current_source_symtab. */
|
||||
current_source_symtab = s;
|
||||
@@ -1378,6 +1379,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
|
||||
|
||||
stream = fdopen (desc, FDOPEN_MODE);
|
||||
clearerr (stream);
|
||||
cleanup = make_cleanup_fclose (stream);
|
||||
|
||||
while (nlines-- > 0)
|
||||
{
|
||||
@@ -1417,7 +1419,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
|
||||
while (c != '\n' && (c = fgetc (stream)) >= 0);
|
||||
}
|
||||
|
||||
fclose (stream);
|
||||
do_cleanups (cleanup);
|
||||
}
|
||||
|
||||
/* Show source lines from the file of symtab S, starting with line
|
||||
|
||||
Reference in New Issue
Block a user