From 4111f652f955028e8219fad2d60af1fd22aa29ee Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 19 May 2020 18:36:24 +0100 Subject: [PATCH] Eliminate target_fileio_open_warn_if_slow This basically makes target_fileio_open_1 extern, renamed to target_fileio_open, and eliminates the current target_fileio_open_warn_if_slow and target_fileio_open. A following parameter will want to change gdb_bfd_iovec_fileio_open, the only caller of target_fileio_open_warn_if_slow, to pass down "warn_if_slow" true/false from the caller, instead of hardcoding "warn_if_slow" true. gdb/ChangeLog: 2020-05-19 Pedro Alves * gdb_bfd.c (gdb_bfd_iovec_fileio_open): Adjust. * target.c (target_fileio_open_1): Rename to target_fileio_open and make extern. Use bool. (target_fileio_open, target_fileio_open_warn_if_slow): Delete. (target_fileio_read_alloc_1): Adjust. * target.h (target_fileio_open): Add 'warn_if_slow' parameter. (target_fileio_open_warn_if_slow): Delete declaration. --- gdb/ChangeLog | 10 ++++++++++ gdb/gdb_bfd.c | 9 ++++----- gdb/target.c | 33 +++++---------------------------- gdb/target.h | 20 +++++++------------- 4 files changed, 26 insertions(+), 46 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a03be43397..643b4eba61 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2020-05-19 Pedro Alves + + * gdb_bfd.c (gdb_bfd_iovec_fileio_open): Adjust. + * target.c (target_fileio_open_1): Rename to target_fileio_open + and make extern. Use bool. + (target_fileio_open, target_fileio_open_warn_if_slow): Delete. + (target_fileio_read_alloc_1): Adjust. + * target.h (target_fileio_open): Add 'warn_if_slow' parameter. + (target_fileio_open_warn_if_slow): Delete declaration. + 2020-05-19 Pedro Alves * gdb_bfd.h: (gdb_bfd_open): Default to 'fd' parameter to -1. diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 26262bfedf..61872a0bf3 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -284,11 +284,10 @@ gdb_bfd_iovec_fileio_open (struct bfd *abfd, void *inferior) gdb_assert (is_target_filename (filename)); - fd = target_fileio_open_warn_if_slow ((struct inferior *) inferior, - filename - + strlen (TARGET_SYSROOT_PREFIX), - FILEIO_O_RDONLY, 0, - &target_errno); + fd = target_fileio_open ((struct inferior *) inferior, + filename + strlen (TARGET_SYSROOT_PREFIX), + FILEIO_O_RDONLY, 0, true, + &target_errno); if (fd == -1) { errno = fileio_errno_to_host (target_errno); diff --git a/gdb/target.c b/gdb/target.c index 6982a806e3..82c405a849 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2775,13 +2775,11 @@ target_ops::fileio_readlink (struct inferior *inf, const char *filename, return {}; } -/* Helper for target_fileio_open and - target_fileio_open_warn_if_slow. */ +/* See target.h. */ -static int -target_fileio_open_1 (struct inferior *inf, const char *filename, - int flags, int mode, int warn_if_slow, - int *target_errno) +int +target_fileio_open (struct inferior *inf, const char *filename, + int flags, int mode, bool warn_if_slow, int *target_errno) { for (target_ops *t = default_fileio_target (); t != NULL; t = t->beneath ()) { @@ -2813,27 +2811,6 @@ target_fileio_open_1 (struct inferior *inf, const char *filename, /* See target.h. */ -int -target_fileio_open (struct inferior *inf, const char *filename, - int flags, int mode, int *target_errno) -{ - return target_fileio_open_1 (inf, filename, flags, mode, 0, - target_errno); -} - -/* See target.h. */ - -int -target_fileio_open_warn_if_slow (struct inferior *inf, - const char *filename, - int flags, int mode, int *target_errno) -{ - return target_fileio_open_1 (inf, filename, flags, mode, 1, - target_errno); -} - -/* See target.h. */ - int target_fileio_pwrite (int fd, const gdb_byte *write_buf, int len, ULONGEST offset, int *target_errno) @@ -3036,7 +3013,7 @@ target_fileio_read_alloc_1 (struct inferior *inf, const char *filename, int target_errno; scoped_target_fd fd (target_fileio_open (inf, filename, FILEIO_O_RDONLY, - 0700, &target_errno)); + 0700, false, &target_errno)); if (fd.get () == -1) return -1; diff --git a/gdb/target.h b/gdb/target.h index 9a1dd805af..37bfb29882 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -2135,21 +2135,15 @@ extern int target_search_memory (CORE_ADDR start_addr, current_top_target ()->filesystem_is_local () /* Open FILENAME on the target, in the filesystem as seen by INF, - using FLAGS and MODE. If INF is NULL, use the filesystem seen - by the debugger (GDB or, for remote targets, the remote stub). - Return a target file descriptor, or -1 if an error occurs (and - set *TARGET_ERRNO). */ + using FLAGS and MODE. If INF is NULL, use the filesystem seen by + the debugger (GDB or, for remote targets, the remote stub). Return + a target file descriptor, or -1 if an error occurs (and set + *TARGET_ERRNO). If WARN_IF_SLOW is true, print a warning message + if the file is being accessed over a link that may be slow. */ extern int target_fileio_open (struct inferior *inf, const char *filename, int flags, - int mode, int *target_errno); - -/* Like target_fileio_open, but print a warning message if the - file is being accessed over a link that may be slow. */ -extern int target_fileio_open_warn_if_slow (struct inferior *inf, - const char *filename, - int flags, - int mode, - int *target_errno); + int mode, bool warn_if_slow, + int *target_errno); /* Write up to LEN bytes from WRITE_BUF to FD on the target. Return the number of bytes written, or -1 if an error occurs -- 2.34.1