diff options
| author | Pedro Alves <pedro@palves.net> | 2020-09-08 17:34:41 +0100 |
|---|---|---|
| committer | Pedro Alves <pedro@palves.net> | 2020-10-26 18:57:40 +0000 |
| commit | d744f0f9652ee8de839c09e4517b18c9b88aecb7 (patch) | |
| tree | 8266ed1925a47e82c6f6bdc0e7825f1ac57c8a33 /gdbserver | |
| parent | 55c3ad8801359ecb166ff3c04c3bd14140f623a1 (diff) | |
| download | gdb-d744f0f9652ee8de839c09e4517b18c9b88aecb7.zip gdb-d744f0f9652ee8de839c09e4517b18c9b88aecb7.tar.gz gdb-d744f0f9652ee8de839c09e4517b18c9b88aecb7.tar.bz2 | |
gdb::handle_eintr, remove need to specify return type
This eliminates the need to specify the return type when using
handle_eintr. We let the compiler deduce it for us.
Also, use lowercase for function parameter names. Uppercase should
only be used on template parameters.
gdb/ChangeLog:
* nat/linux-waitpid.c: Include "gdbsupport/eintr.h".
(my_waitpid): Use gdb::handle_eintr.
gdbserver/ChangeLog:
* netbsd-low.cc (netbsd_waitpid, netbsd_process_target::kill)
(netbsd_qxfer_libraries_svr4): Use gdb::handle_eintr without
explicit type.
gdbsupport/ChangeLog:
* eintr.h (handle_eintr): Replace Ret template parameter with
ErrorValType. Use it as type of the failure value. Deduce the
function's return type using decltype. Use lowercase for function
parameter names.
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdbserver/netbsd-low.cc | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index a7eebfd..0167163 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2020-10-26 Pedro Alves <pedro@palves.net> + + * netbsd-low.cc (netbsd_waitpid, netbsd_process_target::kill) + (netbsd_qxfer_libraries_svr4): Use gdb::handle_eintr without + explicit type. + 2020-10-25 Simon Marchi <simon.marchi@polymtl.ca> * acinclude.m4: Update ptrace.m4 path. diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc index b9b8caf..af54041 100644 --- a/gdbserver/netbsd-low.cc +++ b/gdbserver/netbsd-low.cc @@ -232,7 +232,7 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, int options = (target_options & TARGET_WNOHANG) ? WNOHANG : 0; pid_t pid - = gdb::handle_eintr<int> (-1, ::waitpid, ptid.pid (), &status, options); + = gdb::handle_eintr (-1, ::waitpid, ptid.pid (), &status, options); if (pid == -1) perror_with_name (_("Child process unexpectedly missing")); @@ -443,7 +443,7 @@ netbsd_process_target::kill (process_info *process) return -1; int status; - if (gdb::handle_eintr<int> (-1, ::waitpid, pid, &status, 0) == -1) + if (gdb::handle_eintr (-1, ::waitpid, pid, &status, 0) == -1) return -1; mourn (process); return 0; @@ -1136,15 +1136,15 @@ netbsd_qxfer_libraries_svr4 (const pid_t pid, const char *annex, static bool elf_64_file_p (const char *file) { - int fd = gdb::handle_eintr<int> (-1, ::open, file, O_RDONLY); + int fd = gdb::handle_eintr (-1, ::open, file, O_RDONLY); if (fd < 0) perror_with_name (("open")); Elf64_Ehdr header; - ssize_t ret = gdb::handle_eintr<ssize_t> (-1, ::read, fd, &header, sizeof (header)); + ssize_t ret = gdb::handle_eintr (-1, ::read, fd, &header, sizeof (header)); if (ret == -1) perror_with_name (("read")); - gdb::handle_eintr<int> (-1, ::close, fd); + gdb::handle_eintr (-1, ::close, fd); if (ret != sizeof (header)) error ("Cannot read ELF file header: %s", file); |