From 05de2e998c7df2757ae63ce6a053e27eca3d13ca Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Oct 2013 09:43:55 +0200 Subject: InputStream: use int64_t instead of goffset Decouple some more from GLib. --- src/decoder/ModplugDecoderPlugin.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/decoder/ModplugDecoderPlugin.cxx') diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx index 39c366492..685675350 100644 --- a/src/decoder/ModplugDecoderPlugin.cxx +++ b/src/decoder/ModplugDecoderPlugin.cxx @@ -36,12 +36,12 @@ static constexpr Domain modplug_domain("modplug"); static constexpr size_t MODPLUG_FRAME_SIZE = 4096; static constexpr size_t MODPLUG_PREALLOC_BLOCK = 256 * 1024; static constexpr size_t MODPLUG_READ_BLOCK = 128 * 1024; -static constexpr goffset MODPLUG_FILE_LIMIT = 100 * 1024 * 1024; +static constexpr input_stream::offset_type MODPLUG_FILE_LIMIT = 100 * 1024 * 1024; static GByteArray * mod_loadfile(struct decoder *decoder, struct input_stream *is) { - const goffset size = is->GetSize(); + const input_stream::offset_type size = is->GetSize(); if (size == 0) { LogWarning(modplug_domain, "file is empty"); @@ -77,7 +77,7 @@ mod_loadfile(struct decoder *decoder, struct input_stream *is) return nullptr; } - if (goffset(bdatas->len + ret) > MODPLUG_FILE_LIMIT) { + if (input_stream::offset_type(bdatas->len + ret) > MODPLUG_FILE_LIMIT) { LogWarning(modplug_domain, "stream too large"); g_free(data); g_byte_array_free(bdatas, TRUE); -- cgit v1.2.3