Import CStringView from the Babeltrace tree

[lttng-tools.git] / src / common / file-descriptor.cpp

diff --git a/src/common/file-descriptor.cpp b/src/common/file-descriptor.cpp
index 9491a13af444bc7dbc9d1f372c43e8a5b3c84333..93d7b699f5961eee8cd26e5ffe05b182acb07eb3 100644 (file)
--- a/src/common/file-descriptor.cpp
+++ b/src/common/file-descriptor.cpp
@@ -23,10 +23,6 @@ bool is_valid_fd(int fd)
 }
 } // anonymous namespace
 
-lttng::file_descriptor::file_descriptor() noexcept
-{
-}
-
 lttng::file_descriptor::file_descriptor(int raw_fd) noexcept : _raw_fd{ raw_fd }
 {
        LTTNG_ASSERT(is_valid_fd(_raw_fd));
@@ -49,7 +45,7 @@ lttng::file_descriptor::~file_descriptor() noexcept
        _cleanup();
 }
 
-int lttng::file_descriptor::_fd() const noexcept
+int lttng::file_descriptor::fd() const noexcept
 {
        LTTNG_ASSERT(is_valid_fd(_raw_fd));
        return _raw_fd;
@@ -81,15 +77,15 @@ void lttng::file_descriptor::write(const void *buffer, std::size_t size)
                std::numeric_limits<lttng_write_return_type>::max();
 
        if (size > max_supported_write_size) {
-               LTTNG_THROW_UNSUPPORTED_ERROR(fmt::format(
+               LTTNG_THROW_UNSUPPORTED_ERROR(lttng::format(
                        "Write size exceeds the maximal supported value of lttng_write: write_size={}, maximal_write_size={}",
                        size,
                        max_supported_write_size));
        }
 
-       const auto write_ret = lttng_write(_fd(), buffer, size);
+       const auto write_ret = lttng_write(fd(), buffer, size);
        if (write_ret < 0 || static_cast<std::size_t>(write_ret) != size) {
-               LTTNG_THROW_POSIX(fmt::format("Failed to write to file descriptor: fd={}", _fd()),
+               LTTNG_THROW_POSIX(lttng::format("Failed to write to file descriptor: fd={}", fd()),
                                  errno);
        }
 }
@@ -105,15 +101,15 @@ void lttng::file_descriptor::read(void *buffer, std::size_t size)
        constexpr auto max_supported_read_size = std::numeric_limits<lttng_read_return_type>::max();
 
        if (size > max_supported_read_size) {
-               LTTNG_THROW_UNSUPPORTED_ERROR(fmt::format(
+               LTTNG_THROW_UNSUPPORTED_ERROR(lttng::format(
                        "Read size exceeds the maximal supported value of lttng_read: read_size={}, maximal_read_size={}",
                        size,
                        max_supported_read_size));
        }
 
-       const auto read_ret = lttng_read(_fd(), buffer, size);
+       const auto read_ret = lttng_read(fd(), buffer, size);
        if (read_ret < 0 || static_cast<std::size_t>(read_ret) != size) {
-               LTTNG_THROW_POSIX(fmt::format("Failed to read from file descriptor: fd={}", _fd()),
+               LTTNG_THROW_POSIX(lttng::format("Failed to read from file descriptor: fd={}", fd()),
                                  errno);
        }
 }