From 4a957feb11dd4127e04f272eea88f8a48d3f9e72 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Mon, 9 Jul 2018 08:52:51 +0100 Subject: [PATCH] testing: small fixes. --- src/control.cc | 2 +- src/tests/test-bpsys.cc | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/control.cc b/src/control.cc index 09a1b6b..b8aad43 100644 --- a/src/control.cc +++ b/src/control.cc @@ -778,7 +778,7 @@ bool control_conn_t::send_data() noexcept control_conn_t::~control_conn_t() noexcept { - close(iob.get_watched_fd()); + bp_sys::close(iob.get_watched_fd()); iob.deregister(loop); // Clear service listeners diff --git a/src/tests/test-bpsys.cc b/src/tests/test-bpsys.cc index e2abef9..794f687 100644 --- a/src/tests/test-bpsys.cc +++ b/src/tests/test-bpsys.cc @@ -95,7 +95,7 @@ int kill(pid_t pid, int sig) ssize_t read(int fd, void *buf, size_t count) { - std::vector rrs = read_data[fd]; + std::vector & rrs = read_data[fd]; if (rrs.empty()) { return 0; } @@ -115,9 +115,7 @@ ssize_t read(int fd, void *buf, size_t count) // Consume entire result: std::copy_n(rr.data.begin(), dsize, (char *)buf); // Remove the result record: - auto i = rrs.begin(); - i++; - rrs.erase(rrs.begin(), i); + rrs.erase(rrs.begin()); return dsize; } -- 2.25.1