[vte] lib: Remove duplicated code
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] lib: Remove duplicated code
- Date: Mon, 27 Apr 2020 18:51:06 +0000 (UTC)
commit 387b0a4924c895d14c5776093274fecd13c23138
Author: Christian Persch <chpe src gnome org>
Date: Mon Apr 27 20:49:04 2020 +0200
lib: Remove duplicated code
src/pty.cc | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/src/pty.cc b/src/pty.cc
index 2516a32c..83b1c74b 100644
--- a/src/pty.cc
+++ b/src/pty.cc
@@ -332,27 +332,6 @@ Pty::get_size(int* rows,
return false;
}
-static int
-fd_set_cloexec(vte::libc::FD& fd)
-{
- int flags = fcntl(fd.get(), F_GETFD, 0);
- if (flags < 0)
- return flags;
-
- return fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
-}
-
-static int
-fd_set_nonblocking(vte::libc::FD& fd)
-{
- int flags = fcntl(fd.get(), F_GETFL, 0);
- if (flags < 0)
- return -1;
- if ((flags & O_NONBLOCK) != 0)
- return 0;
- return fcntl(fd.get(), F_SETFL, flags | O_NONBLOCK);
-}
-
static int
fd_set_cpkt(vte::libc::FD& fd)
{
@@ -377,14 +356,14 @@ fd_setup(vte::libc::FD& fd)
return -1;
}
- if (fd_set_cloexec(fd) < 0) {
+ if (vte::libc::fd_set_cloexec(fd.get()) < 0) {
auto errsv = vte::libc::ErrnoSaver{};
_vte_debug_print(VTE_DEBUG_PTY,
"%s failed: %s", "Setting CLOEXEC flag", g_strerror(errsv));
return -1;
}
- if (fd_set_nonblocking(fd) < 0) {
+ if (vte::libc::fd_set_nonblock(fd.get()) < 0) {
auto errsv = vte::libc::ErrnoSaver{};
_vte_debug_print(VTE_DEBUG_PTY,
"%s failed: %s", "Setting O_NONBLOCK flag", g_strerror(errsv));
@@ -438,14 +417,14 @@ _vte_pty_open_posix(void)
}
#ifndef __linux__
- if (need_cloexec && fd_set_cloexec(fd) < 0) {
+ if (need_cloexec && vte::libc::fd_set_cloexec(fd) < 0) {
auto errsv = vte::libc::ErrnoSaver{};
_vte_debug_print(VTE_DEBUG_PTY,
"%s failed: %s", "Setting CLOEXEC flag", g_strerror(errsv));
return {};
}
- if (need_nonblocking && fd_set_nonblocking(fd) < 0) {
+ if (need_nonblocking && vte::libc::fd_set_nonblock(fd) < 0) {
auto errsv = vte::libc::ErrnoSaver{};
_vte_debug_print(VTE_DEBUG_PTY,
"%s failed: %s", "Setting NONBLOCK flag", g_strerror(errsv));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]