diff options
author | Tom Tromey <tom@tromey.com> | 2019-01-24 06:43:45 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-03-06 16:04:31 -0700 |
commit | 6cceac94147f6026e93dcfc0a0df03555b571a12 (patch) | |
tree | ae45737eb987a1c699bc1d05ae7c4366b821c716 /gdb/nat | |
parent | 724127627fef458ed330d027cf0b3d17580af615 (diff) | |
download | gdb-6cceac94147f6026e93dcfc0a0df03555b571a12.zip gdb-6cceac94147f6026e93dcfc0a0df03555b571a12.tar.gz gdb-6cceac94147f6026e93dcfc0a0df03555b571a12.tar.bz2 |
Remove last cleanup from linux-namespaces.c
This removes the last cleanup from linux-namespaces.c, replacing it
with a use of SCOPE_EXIT.
2019-03-06 Tom Tromey <tom@tromey.com>
* nat/linux-namespaces.c (linux_mntns_access_fs): Use SCOPE_EXIT.
* common/filestuff.h (make_cleanup_close): Don't declare.
* common/filestuff.c (do_close_cleanup, make_cleanup_close):
Remove.
Diffstat (limited to 'gdb/nat')
-rw-r--r-- | gdb/nat/linux-namespaces.c | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c index 812f8c1..c0f326b 100644 --- a/gdb/nat/linux-namespaces.c +++ b/gdb/nat/linux-namespaces.c @@ -28,6 +28,7 @@ #include "common/gdb_wait.h" #include <signal.h> #include <sched.h> +#include "common/scope-exit.h" /* See nat/linux-namespaces.h. */ int debug_linux_namespaces; @@ -887,12 +888,11 @@ enum mnsh_fs_code static enum mnsh_fs_code linux_mntns_access_fs (pid_t pid) { - struct cleanup *old_chain; struct linux_ns *ns; struct stat sb; struct linux_mnsh *helper; ssize_t size; - int fd, saved_errno; + int fd; if (pid == getpid ()) return MNSH_FS_DIRECT; @@ -901,27 +901,26 @@ linux_mntns_access_fs (pid_t pid) if (ns == NULL) return MNSH_FS_DIRECT; - old_chain = make_cleanup (null_cleanup, NULL); - fd = gdb_open_cloexec (linux_ns_filename (ns, pid), O_RDONLY, 0); if (fd < 0) - goto error; + return MNSH_FS_ERROR; - make_cleanup_close (fd); + SCOPE_EXIT + { + int save_errno = errno; + close (fd); + errno = save_errno; + }; if (fstat (fd, &sb) != 0) - goto error; + return MNSH_FS_ERROR; if (sb.st_ino == ns->id) - { - do_cleanups (old_chain); - - return MNSH_FS_DIRECT; - } + return MNSH_FS_DIRECT; helper = linux_mntns_get_helper (); if (helper == NULL) - goto error; + return MNSH_FS_ERROR; if (sb.st_ino != helper->nsid) { @@ -929,10 +928,10 @@ linux_mntns_access_fs (pid_t pid) size = mnsh_send_setns (helper, fd, 0); if (size < 0) - goto error; + return MNSH_FS_ERROR; if (mnsh_recv_int (helper, &result, &error) != 0) - goto error; + return MNSH_FS_ERROR; if (result != 0) { @@ -945,23 +944,13 @@ linux_mntns_access_fs (pid_t pid) error = ENOTSUP; errno = error; - goto error; + return MNSH_FS_ERROR; } helper->nsid = sb.st_ino; } - do_cleanups (old_chain); - return MNSH_FS_HELPER; - -error: - saved_errno = errno; - - do_cleanups (old_chain); - - errno = saved_errno; - return MNSH_FS_ERROR; } /* See nat/linux-namespaces.h. */ |