mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-10-17 21:03:55 +08:00
* 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:
@ -2292,6 +2292,7 @@ tracepoint_save_command (char *args, int from_tty)
|
||||
char *i1 = " ", *i2 = " ";
|
||||
char *indent, *actionline, *pathname;
|
||||
char tmp[40];
|
||||
struct cleanup *cleanup;
|
||||
|
||||
if (args == 0 || *args == 0)
|
||||
error (_("Argument required (file name in which to save tracepoints)"));
|
||||
@ -2303,10 +2304,11 @@ tracepoint_save_command (char *args, int from_tty)
|
||||
}
|
||||
|
||||
pathname = tilde_expand (args);
|
||||
cleanup = make_cleanup (xfree, pathname);
|
||||
if (!(fp = fopen (pathname, "w")))
|
||||
error (_("Unable to open file '%s' for saving tracepoints (%s)"),
|
||||
args, safe_strerror (errno));
|
||||
xfree (pathname);
|
||||
make_cleanup_fclose (fp);
|
||||
|
||||
ALL_TRACEPOINTS (tp)
|
||||
{
|
||||
@ -2348,7 +2350,7 @@ tracepoint_save_command (char *args, int from_tty)
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose (fp);
|
||||
do_cleanups (cleanup);
|
||||
if (from_tty)
|
||||
printf_filtered ("Tracepoints saved to file '%s'.\n", args);
|
||||
return;
|
||||
|
Reference in New Issue
Block a user