From df39ea259cf099cb2de3d26905078dddf47832cd Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:38:59 -0700 Subject: [PATCH] Add target_ops argument to to_fileio_close 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. * target.c (target_fileio_close): Add argument. * remote.c (remote_hostio_close): Add 'self' argument. (remote_hostio_close_cleanup): Update. (remote_bfd_iovec_close, remote_file_put, remote_file_get): Update. * inf-child.c (inf_child_fileio_close): Add 'self' argument. --- gdb/ChangeLog | 10 ++++++++++ gdb/inf-child.c | 2 +- gdb/remote.c | 10 +++++----- gdb/target.c | 2 +- gdb/target.h | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aa018e8a0ca..fb75b1a6f4d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2014-02-19 Tom Tromey + + * target.h (struct target_ops) : Add argument. + * target.c (target_fileio_close): Add argument. + * remote.c (remote_hostio_close): Add 'self' argument. + (remote_hostio_close_cleanup): Update. + (remote_bfd_iovec_close, remote_file_put, remote_file_get): + Update. + * inf-child.c (inf_child_fileio_close): Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. diff --git a/gdb/inf-child.c b/gdb/inf-child.c index 8837fd8c331..01bf1af7a63 100644 --- a/gdb/inf-child.c +++ b/gdb/inf-child.c @@ -314,7 +314,7 @@ inf_child_fileio_pread (struct target_ops *self, /* Close FD on the target. Return 0, or -1 if an error occurs (and set *TARGET_ERRNO). */ static int -inf_child_fileio_close (int fd, int *target_errno) +inf_child_fileio_close (struct target_ops *self, int fd, int *target_errno) { int ret; diff --git a/gdb/remote.c b/gdb/remote.c index 814f945f8c1..19bef54c1c9 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -9752,7 +9752,7 @@ remote_hostio_pread (struct target_ops *self, (and set *REMOTE_ERRNO). */ static int -remote_hostio_close (int fd, int *remote_errno) +remote_hostio_close (struct target_ops *self, int fd, int *remote_errno) { struct remote_state *rs = get_remote_state (); char *p = rs->buf; @@ -9891,7 +9891,7 @@ remote_hostio_close_cleanup (void *opaque) int fd = *(int *) opaque; int remote_errno; - remote_hostio_close (fd, &remote_errno); + remote_hostio_close (find_target_at (process_stratum), fd, &remote_errno); } @@ -9928,7 +9928,7 @@ remote_bfd_iovec_close (struct bfd *abfd, void *stream) /* Ignore errors on close; these may happen if the remote connection was already torn down. */ - remote_hostio_close (fd, &remote_errno); + remote_hostio_close (find_target_at (process_stratum), fd, &remote_errno); /* Zero means success. */ return 0; @@ -10077,7 +10077,7 @@ remote_file_put (const char *local_file, const char *remote_file, int from_tty) } discard_cleanups (close_cleanup); - if (remote_hostio_close (fd, &remote_errno)) + if (remote_hostio_close (find_target_at (process_stratum), fd, &remote_errno)) remote_hostio_error (remote_errno); if (from_tty) @@ -10135,7 +10135,7 @@ remote_file_get (const char *remote_file, const char *local_file, int from_tty) } discard_cleanups (close_cleanup); - if (remote_hostio_close (fd, &remote_errno)) + if (remote_hostio_close (find_target_at (process_stratum), fd, &remote_errno)) remote_hostio_error (remote_errno); if (from_tty) diff --git a/gdb/target.c b/gdb/target.c index 00083c22a0d..8767b572391 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3458,7 +3458,7 @@ target_fileio_close (int fd, int *target_errno) { if (t->to_fileio_close != NULL) { - int ret = t->to_fileio_close (fd, target_errno); + int ret = t->to_fileio_close (t, fd, target_errno); if (targetdebug) fprintf_unfiltered (gdb_stdlog, diff --git a/gdb/target.h b/gdb/target.h index eb83cb95cd6..e2dddc71cf2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -736,7 +736,7 @@ struct target_ops /* Close FD on the target. Return 0, or -1 if an error occurs (and set *TARGET_ERRNO). */ - int (*to_fileio_close) (int fd, int *target_errno); + int (*to_fileio_close) (struct target_ops *, int fd, int *target_errno); /* Unlink FILENAME on the target. Return 0, or -1 if an error occurs (and set *TARGET_ERRNO). */