lib: Remove ostream.get_used_size()

Removes backwards compatibility.

diff --git a/src/lib/ostream-private.h b/src/lib/ostream-private.h
index f77cb059a901aa823e810bc0a9a878bc1ecb934b..6222aa08d3b42bded8548698e066fa300d62b697 100644 (file)
--- a/src/lib/ostream-private.h
+++ b/src/lib/ostream-private.h
@@ -15,7 +15,6 @@ struct ostream_private {
                                   stream_flush_callback_t *callback,
                                   void *context);
        void (*flush_pending)(struct ostream_private *stream, bool set);
-       size_t (*get_used_size)(const struct ostream_private *stream);
        size_t (*get_buffer_used_size)(const struct ostream_private *stream);
        size_t (*get_buffer_avail_size)(const struct ostream_private *stream);
        int (*seek)(struct ostream_private *stream, uoff_t offset);

diff --git a/src/lib/ostream.c b/src/lib/ostream.c
index 1c07c90cc5da47545f1de257f8db15df0f20cd6e..594bebc89e2e0790b162b1449ee7d4be88f16aa4 100644 (file)
--- a/src/lib/ostream.c
+++ b/src/lib/ostream.c
@@ -218,10 +218,7 @@ size_t o_stream_get_buffer_used_size(const struct ostream *stream)
 {
        const struct ostream_private *_stream = stream->real_stream;
 
-       if (_stream->get_buffer_used_size != NULL)
-               return _stream->get_buffer_used_size(_stream);
-
-       return _stream->get_used_size(_stream);
+       return _stream->get_buffer_used_size(_stream);
 }
 
 size_t o_stream_get_buffer_avail_size(const struct ostream *stream)
@@ -630,7 +627,7 @@ o_stream_default_set_flush_pending(struct ostream_private *_stream, bool set)
 }
 
 static size_t
-o_stream_default_get_used_size(const struct ostream_private *_stream)
+o_stream_default_get_buffer_used_size(const struct ostream_private *_stream)
 {
        if (_stream->parent == NULL)
                return 0;
@@ -734,8 +731,9 @@ o_stream_create(struct ostream_private *_stream, struct ostream *parent, int fd)
        }
        if (_stream->flush_pending == NULL)
                _stream->flush_pending = o_stream_default_set_flush_pending;
-       if (_stream->get_used_size == NULL)
-               _stream->get_used_size = o_stream_default_get_used_size;
+       if (_stream->get_buffer_used_size == NULL)
+               _stream->get_buffer_used_size =
+                       o_stream_default_get_buffer_used_size;
        if (_stream->get_buffer_avail_size == NULL) {
                _stream->get_buffer_avail_size =
                        o_stream_default_get_buffer_avail_size;