From d8c3deb02824d666b378c36666c3afc8fad31ac8 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 5 Apr 2024 15:54:33 +1100 Subject: [PATCH] aux: remove DynIOBuffer::allocated This largely reverts commit 8cfde80759598fc46147d5f0c2c729d708330a38. Updates #135 --- internal/cgen/auxiliary/base.cc | 19 ++++--------------- internal/cgen/auxiliary/base.hh | 2 -- release/c/wuffs-unsupported-snapshot.c | 21 ++++----------------- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/internal/cgen/auxiliary/base.cc b/internal/cgen/auxiliary/base.cc index 3622285b..a4e84724 100644 --- a/internal/cgen/auxiliary/base.cc +++ b/internal/cgen/auxiliary/base.cc @@ -25,16 +25,12 @@ DynIOBuffer::DynIOBuffer(uint64_t max_incl) : m_buf(wuffs_base__empty_io_buffer()), m_max_incl(max_incl) {} DynIOBuffer::~DynIOBuffer() { - if (allocated()) { - free(m_buf.data.ptr); - } + free(m_buf.data.ptr); } void // DynIOBuffer::drop() { - if (allocated()) { - free(m_buf.data.ptr); - } + free(m_buf.data.ptr); m_buf = wuffs_base__empty_io_buffer(); } @@ -48,9 +44,8 @@ DynIOBuffer::grow(uint64_t min_incl) { } else if (n > SIZE_MAX) { return DynIOBuffer::GrowResult::FailedOutOfMemory; } else if (n > m_buf.data.len) { - uint8_t* ptr = static_cast( - allocated() ? realloc(m_buf.data.ptr, static_cast(n)) - : malloc(static_cast(n))); + uint8_t* ptr = + static_cast(realloc(m_buf.data.ptr, static_cast(n))); if (!ptr) { return DynIOBuffer::GrowResult::FailedOutOfMemory; } @@ -60,12 +55,6 @@ DynIOBuffer::grow(uint64_t min_incl) { return DynIOBuffer::GrowResult::OK; } -bool // -DynIOBuffer::allocated() { - IOBuffer buf = wuffs_base__empty_io_buffer(); - return buf.data.ptr != m_buf.data.ptr; -} - // round_up rounds min_incl up, returning the smallest value x satisfying // (min_incl <= x) and (x <= max_incl) and some other constraints. It returns 0 // if there is no such x. diff --git a/internal/cgen/auxiliary/base.hh b/internal/cgen/auxiliary/base.hh index 28f9ccde..03a49cb2 100644 --- a/internal/cgen/auxiliary/base.hh +++ b/internal/cgen/auxiliary/base.hh @@ -84,8 +84,6 @@ class DynIOBuffer { DynIOBuffer(const DynIOBuffer&) = delete; DynIOBuffer& operator=(const DynIOBuffer&) = delete; - bool allocated(); - static uint64_t round_up(uint64_t min_incl, uint64_t max_incl); }; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 4c406ebd..ceb4ff17 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -14440,8 +14440,6 @@ class DynIOBuffer { DynIOBuffer(const DynIOBuffer&) = delete; DynIOBuffer& operator=(const DynIOBuffer&) = delete; - bool allocated(); - static uint64_t round_up(uint64_t min_incl, uint64_t max_incl); }; @@ -72077,16 +72075,12 @@ DynIOBuffer::DynIOBuffer(uint64_t max_incl) : m_buf(wuffs_base__empty_io_buffer()), m_max_incl(max_incl) {} DynIOBuffer::~DynIOBuffer() { - if (allocated()) { - free(m_buf.data.ptr); - } + free(m_buf.data.ptr); } void // DynIOBuffer::drop() { - if (allocated()) { - free(m_buf.data.ptr); - } + free(m_buf.data.ptr); m_buf = wuffs_base__empty_io_buffer(); } @@ -72100,9 +72094,8 @@ DynIOBuffer::grow(uint64_t min_incl) { } else if (n > SIZE_MAX) { return DynIOBuffer::GrowResult::FailedOutOfMemory; } else if (n > m_buf.data.len) { - uint8_t* ptr = static_cast( - allocated() ? realloc(m_buf.data.ptr, static_cast(n)) - : malloc(static_cast(n))); + uint8_t* ptr = + static_cast(realloc(m_buf.data.ptr, static_cast(n))); if (!ptr) { return DynIOBuffer::GrowResult::FailedOutOfMemory; } @@ -72112,12 +72105,6 @@ DynIOBuffer::grow(uint64_t min_incl) { return DynIOBuffer::GrowResult::OK; } -bool // -DynIOBuffer::allocated() { - IOBuffer buf = wuffs_base__empty_io_buffer(); - return buf.data.ptr != m_buf.data.ptr; -} - // round_up rounds min_incl up, returning the smallest value x satisfying // (min_incl <= x) and (x <= max_incl) and some other constraints. It returns 0 // if there is no such x.